Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2450 commits 22 branches 1 tag 31 MiB
Commit graph

59 commits

Author SHA1 Message Date
Philipp Rothmann
d0147986d9 group order edit title more clear 2023-02-23 13:29:58 +01:00
Philipp Rothmann
6cec721d4d group order show window with some explanations 2023-02-22 14:31:17 +01:00
Philipp Rothmann
dd7beab9bd group order switch menu use show view 2023-02-22 14:30:23 +01:00
Philipp Rothmann
c3761095e7 group order fix dancing quantity buttons 2023-02-22 14:29:46 +01:00
Philipp Rothmann
fead6a1c0d rework group order show view 2023-02-22 12:12:16 +01:00
Philipp Rothmann
a0d62f7948 wip: rework group order details 
tried to reduce the amount of informations shown. but needs some user feedback, what information are actually relevant
 2023-02-22 12:12:16 +01:00
Philipp Rothmann
657b3e63bc rework group order edit form 
* make switch order a menu list
* table more slim
* alert when balance negative instead of making everything red
* search to the right
 2023-02-22 12:12:16 +01:00
Philipp Rothmann
fec94f9683 fix switch menu 2023-02-21 14:07:02 +01:00
Philipp Rothmann
5e9bd17606 group order make 'current orders' more obvious 2023-02-20 22:33:42 +01:00
Philipp Rothmann
ae09bbaced group order pull search to the right 2023-02-20 22:32:33 +01:00
Philipp Rothmann
a847d86121 group order make order details collapse 2023-02-20 22:32:07 +01:00
Philipp Rothmann
2530535244 roup order swap plus and minus buttons 
because it's more naturally intuitive like this
 2023-02-20 19:35:26 +01:00
Philipp Rothmann
3fa8dba5df remove group order panel close buttons 
things shouldn't just disapear
 2023-02-20 18:57:23 +01:00
viehlieb
86708f6f8d solve hover problem for ordering articles 2023-02-20 17:43:27 +01:00
viehlieb
37743d4586 fix behavior - when link is provided in article details not clickable due to hover property 2023-02-20 17:42:57 +01:00
Patrick Gansterer
4c567fece1 Add transport costs to Order 2020-08-07 00:52:43 +02:00
Florian Lentsch
5eb8abf431 Potential fix for one of the issues mentioned in #49 
Reduces the number of SQL queries used on group_orders/index and
group_orders/archive, but adds extra  complexity to the code
 2020-07-29 13:15:11 +02:00
Patrick Gansterer
739914ad43 Show only started orders to members for ordering 2020-03-23 16:25:54 +01:00
Martin Ortbauer
4b1e9a6f53 improve usability when ordering (PR #552) 
also show box with links to currently open orders after the order has been saved
 2018-10-11 22:15:00 +02:00
Patrick Gansterer
72b5a5ca82 Add option to show account balance instead of available funds 
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
 2017-10-28 20:16:25 +02:00
Patrick Gansterer
f286dd6053 Add pickup date 
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
 2016-04-29 15:28:05 +02:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
Alexander Kirk
75967bad22 Add color marking to items in group orders that have missing items 2015-05-04 06:16:14 +02:00
wvengen
507651f5ba Move small close button to helper. 
Workaround for show order deface override nuking attributes of the close button.
 2015-04-10 18:58:51 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
935fdedd66 hide row when information not present 2013-11-24 02:16:15 +01:00
wvengen
e5471b9f73 more i18n cleanup 2013-11-24 01:47:34 +01:00
wvengen
652a392b37 simplify i18n and fix some small ui issues 2013-11-23 17:49:43 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen
a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +01:00
wvengen
c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen
34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
 2013-10-09 23:57:43 +02:00
Julius
3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +02:00
wvengen
64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
Julius
a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius
9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
Julius
3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) 2013-09-22 22:07:34 +02:00
Julius
6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius
891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Julius
14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +02:00
wvengen
33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
wvengen
c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
Benjamin Meichsner
93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00
wvengen
f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen
7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner
8bafb3f4b2 Show supplier name for articles in stockit order. 2013-03-12 19:08:18 +01:00
wvengen
734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen
8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00