raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 18 Branches 452 Tags
af4baabb50dc78f68479a00a2038bceb984cefcf
Commit Graph

743 Commits

Author SHA1 Message Date
Rohan Mitchell
7f6c02ca29 Add User#customer_of to look up customers 2015-04-16 10:59:15 +10:00
Rohan Mitchell
34d1841d22 Make Variant#full_name resilient to regex chars 2015-04-16 10:59:15 +10:00
Rohan Mitchell
e570352a1b Grant fewer permissions on enterprise creation 2015-04-16 10:59:15 +10:00
Rob Harrington
96c173414b Adding has_permission method to enterprise_relationship 2015-04-10 12:48:27 +10:00
Rob Harrington
7eb735f87e Adding for_enterprises scope on enterprise fee 2015-04-06 10:24:40 +10:00
Rob Harrington
7448d41b27 Adding abilities for new for_order_cycle action 2015-04-06 10:23:39 +10:00
Rob Harrington
3b9824171a Adding with_order_cycles_as_supplier_outer scope to Enterprise 2015-04-02 15:53:32 +11:00
Rob Harrington
ca1a5b5f8d Ignoring any new producer properties submitted by the user 2015-04-02 08:54:35 +11:00
Rob Harrington
94a88278a9 Ignore the unit_to_display when it is wholly contained within display_name or vice versa 2015-04-01 15:46:11 +11:00
Rob Harrington
54af6886c2 Line items with a quantity of zero return price_with_adjustments of 0.0 2015-04-01 12:34:22 +11:00
Rob Harrington
d49dd62124 Replace unused bugsnag notification with one to test for line items with a quantity of zero 2015-04-01 11:38:06 +11:00
Rob Harrington
d8c4e292c8 Adding method for determining variant override hubs 2015-03-27 16:09:45 +11:00
Rob Harrington
2310a6a7db Splitting out order cycle abilities from general order management abilities 2015-03-27 16:07:37 +11:00
Rob Harrington
85e4b3970c Adding an 'involved' scope to exchanges 2015-03-27 15:56:07 +11:00
Rohan Mitchell
d8656a36c6 Consistency in tax calculations, remove some unneeded local vars 2015-03-25 16:31:15 +11:00
Rohan Mitchell
89d4a59e9d Extract order total tax calculations to model 2015-03-25 16:27:29 +11:00
Rohan Mitchell
9650692699 Calculate total tax on enterprise fees for an order 2015-03-25 16:27:29 +11:00
Rohan Mitchell
7fb8370c36 Look up shipping tax on an order 2015-03-25 16:27:29 +11:00
Rohan Mitchell
e38772ada0 Enterprise user can delete unreferenced order cycles 2015-03-16 12:41:06 +11:00
Rohan Mitchell
4491d3cc73 Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix 
Conflicts:
	app/views/admin/order_cycles/_row.html.haml
	spec/features/admin/order_cycles_spec.rb
 2015-03-16 12:14:54 +11:00
Rob Harrington
bdeca54377 Reloading stale enterprise object in test 2015-03-14 16:17:16 +11:00
Rob Harrington
cb28843af1 Reload manager before ensuring owner is a manager 2015-03-14 10:41:49 +11:00
Rohan Mitchell
8d3f25bb39 Fix intermittent 500 error when updating the cart 2015-03-13 17:50:01 +11:00
Rohan Mitchell
6365434a94 Merge branch 'lin-d-hop-ordercyclemanagementreports2' 2015-03-13 10:53:03 +11:00
Rohan Mitchell
008b43b1fc Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 2015-03-13 10:47:49 +11:00
Rohan Mitchell
5609354136 Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs 2015-03-13 10:45:38 +11:00
Lynne Davis
d9e8ce2f0e Fix bug in report that selecting multiple payment methods didn't work. Added spec as well 2015-03-12 17:16:51 +11:00
Rohan Mitchell
a5716cf2c2 Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 2015-03-12 12:15:22 +11:00
Victor Nava
d6c30ae1ef OrderCycle#recently_closed doesn't return orders that are open 2015-03-05 17:28:24 +11:00
Victor Nava
1b709a3e03 Do not load Order Cycles that closed more than a month a go 2015-03-05 16:04:36 +11:00
Rohan Mitchell
b5ce056d06 Fix tax calculations for determining tax included in an amount 2015-03-05 13:03:53 +11:00
Rohan Mitchell
dfb855bd14 Record the tax included in shipping. 2015-03-05 10:44:27 +11:00
Rohan Mitchell
9395f6c808 Record the tax included in adjustments. TaxRate adjustments consist of 100% tax. 2015-03-05 10:44:26 +11:00
Rohan Mitchell
53fa71d1f3 Admin can set enterprise fee's tax category 2015-03-05 10:44:25 +11:00
Rohan Mitchell
61c08997a1 EnterpriseFee has a TaxCategory 2015-03-05 10:44:22 +11:00
Rohan Mitchell
ec22f4c09f Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time 2015-03-05 10:43:57 +11:00
Matt-Yorkley
0f3723a923 Added currency symbols to sales tax report 2015-03-05 10:43:51 +11:00
Matt-Yorkley
623882a2a1 Config option for tax rate on shipping 2015-03-05 10:43:50 +11:00
Matt-Yorkley
be55f461d0 Report: sales tax on orders 2015-03-05 10:43:50 +11:00
Lynne Davis
cfa281478a Adding ability to edit ShippingCategory.temperature_controlled from admin interface 2015-03-04 12:02:07 +11:00
Lynne Davis
2a8ba0bf42 Fixing merge conflicts after rebase 2015-03-03 16:12:07 +11:00
Lynne Davis
39c5f8febe Updating Customer model with validations 2015-03-03 16:01:42 +11:00
Lynne Davis
87b1ab9a1a LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report 2015-03-03 16:01:42 +11:00
Maikel Linke
3beff77164 Merge remote-tracking branch 'origin/master' into group-pages 2015-02-26 17:22:13 +11:00
Rohan Mitchell
fa4741eb65 Update auto-creation of E2E links: more specific and restricted link creation 2015-02-26 13:49:15 +11:00
Maikel Linke
c01d45e3af Serialize move_up and move_down methods of groups 
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
 2015-02-19 16:51:58 +11:00
Maikel Linke
d5c2abdd7e stripping "undefined" in after_find and after_save callbacks instead of overriding getters 2015-02-19 16:33:43 +11:00
Maikel Linke
718a5911a3 code style and cleanup 2015-02-19 10:48:39 +11:00
Maikel Linke
903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge 
Conflicts:
	README.markdown
	db/schema.rb
 2015-02-13 15:42:36 +11:00
Rohan Mitchell
636ed2ad0d Make bi-directional relationships 2015-02-13 09:24:48 +11:00