raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,603 Commits 18 Branches 452 Tags
e423e890e0cd91fd30bf4d61dee59ea96456530d
Commit Graph

4891 Commits

Author SHA1 Message Date
Steve Pettitt
e423e890e0 Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly 2016-01-15 09:07:50 +11:00
Steve Pettitt
25454d3e97 Added new fields to fix VO deletion feature specs 2016-01-15 09:07:49 +11:00
Rob Harrington
94785d4157 Fixing authorization for VariantOverridesController#bulk_reset 2016-01-15 09:07:49 +11:00
Rob Harrington
d01da727f0 Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead 2016-01-15 09:07:49 +11:00
Steve Pettitt
5a62098b95 Cleaning up and attempt to add feature spec 2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232 Added toggle to enable/disable reset stock. Updated specs 2016-01-15 09:07:48 +11:00
Steve Pettitt
2921958788 Variant override controller spec added 2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3 Added angular service tests for variant overrides stock reset 2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08 WIP: Adding view and routes for resetting variant_overrides count_on_hand 2016-01-15 09:07:48 +11:00
Rob Harrington
cc4dc068ab Adding variant SKU field to BPE 2016-01-13 18:49:34 +11:00
Rob Harrington
64cd52e067 Adding SKU and on demand to a few VO specs 2016-01-13 18:49:34 +11:00
Rob Harrington
4553bc2997 Moving SaveBar directive and StatusMessage service into admin.utils module 2016-01-13 18:49:33 +11:00
Rob Harrington
521f227f74 Adding sku and on_demand to VariantOverride 2016-01-13 18:49:33 +11:00
Rob Harrington
cab6871de3 Pulling bulk actions dropdown out into partial 2016-01-13 18:49:33 +11:00
Rob Harrington
7cd8f35ac8 Tidying up styling and use of skeleton columns on index pages 2016-01-13 18:49:33 +11:00
Rob Harrington
2b70ddb23c Adding columns toggle to variant overrides index 2016-01-13 18:49:33 +11:00
Rob Harrington
9eaec6061e Pulling columns dropdown out into a shared partial 2016-01-13 18:49:32 +11:00
Rob Harrington
54e7677888 Integrating StatusMessages into save-bar, adding to variant overrides index 2016-01-13 18:49:32 +11:00
Rob Harrington
c781113a65 Adding filters to variant overrides interface 2016-01-13 18:49:32 +11:00
Rob Harrington
4237a83028 Moving components required for variant overrides into appropriate modules 2016-01-13 18:49:32 +11:00
Rob Harrington
f11e878e7f WIP: Reorganising variant overrides javascript files 2016-01-13 18:49:31 +11:00
Maikel Linke
1cfb5a7feb Merge branch 'master' of https://github.com/blancnic/openfoodnetwork into blancnic-master 2016-01-13 15:06:11 +11:00
Nicolas Blanc
770a8d0b17 #771-minor-bug-on-Firefox 
Z-index:1 solved problem on Firefox. It works on Chrome too.
 2016-01-10 09:54:35 +01:00
Rohan Mitchell
71569324f4 Serialise cart updates - do not submit another until the previous has completed 2016-01-07 13:53:37 +11:00
Rohan Mitchell
257b5a9eef Move premature Spree::Order#update prevention up a level, for even greater efficiency gains 2016-01-07 12:09:57 +11:00
Rohan Mitchell
e24027a8d0 Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee 2016-01-07 10:52:36 +11:00
Christian
823a6bff5b Use config to get logo in mails 
Use ContentConfig.footer_logo to get localized logo file instead of
defaut AUS logo.
 2015-12-24 11:31:47 +11:00
Rob Harrington
e67e22ee73 Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security 
Conflicts:
	lib/open_food_network/xero_invoices_report.rb
 2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2 Restricting access to orders within Sales Tax Report 
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
 2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e Restricting access to orders within Xero Invoices Report 
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
 2015-12-17 14:21:30 +11:00
Rob Harrington
4b5e33d5b0 Implementing new permissions for producers in reports_controller_spec 2015-12-17 14:21:30 +11:00
Rob Harrington
c579d302d5 Fixing customer info security for orders and distributors report 2015-12-17 14:21:30 +11:00
Continuous Integration
23b9dd5c71 Auto-merge from CI [skip ci] 2015-12-17 13:02:37 +11:00
Maikel Linke
bc6110c178 Re-defining in_distributor scope as method to allow chaining 2015-12-17 12:42:28 +11:00
Rob Harrington
e0da49e4df Formatting dates for account invoices in rails time zone 2015-12-17 11:34:06 +11:00
Rob Harrington
b004060679 Printing invoices doesn't fail when order has no order cycle 2015-12-17 11:33:18 +11:00
Rob Harrington
26a2f1a280 Adjustments on account invoices are created based on presence of a bill 
Rather than of turnover
 2015-12-16 23:10:47 +11:00
Rob Harrington
83e3fb98f7 Only display billable period adjustments where the amount in > 0 
Rather than where the bill (which is calculated according to current settings) is > 0
 2015-12-16 19:18:59 +11:00
Rob Harrington
bac4fcbd8f Make sure that adjustments for billable periods have a valid order to attach to when creating/updating 2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3 Fixing up enterprise user account page 2015-12-16 19:18:59 +11:00
Rob Harrington
fe0652e243 When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value 2015-12-16 19:18:59 +11:00
Rob Harrington
0370723edd Attempt to add a sensible name and contact number to Account Invoice addresses 2015-12-16 19:18:58 +11:00
Rob Harrington
d46712de84 Obsolete BillablePeriods only deleted if their associated order is not already complete 2015-12-16 19:18:58 +11:00
Rob Harrington
0ed8cf973d Adding an example bill calculator to business model config edit page 
To allow super admin to see the effects of any changes they make to BMC settings
 2015-12-16 19:18:58 +11:00
Rob Harrington
76d4f74f6b Ammending BillablePeriod spec to be ensure tax is charged correctly 2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda Reorganising busines model config settings, moving account invoice tax rate in busines model config settings 2015-12-16 19:18:57 +11:00
Rob Harrington
85f61364f8 BillablePeriods use global config to calculate bills 2015-12-16 19:18:57 +11:00
Rob Harrington
c1d04af5cc Implementing monthly billing description logic in required pages 2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738 Adding helper for describing monthly billing charges 2015-12-16 19:18:57 +11:00
Rob Harrington
da325780b1 Adding BMC link to configurations menu 2015-12-16 19:18:57 +11:00