raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,619 Commits 18 Branches 452 Tags
f68f7ea2b6f32dd4bc40195accbe39d42f35c992
Commit Graph

6619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
f68f7ea2b6 Fix display of "Total" 2016-01-15 12:07:43 +11:00
Maikel
ddf6eef370 Auto-merged master into ng-vo-inventory-reset on deployment. 2016-01-15 09:21:54 +11:00
Rob Harrington
9979e31220 Final tidy up after rebasing default_inventory and ng-vo onto origin/master 
Fixes a few VO feature specs and a few interface tweaks
 2016-01-15 09:07:51 +11:00
Rob Harrington
669642292b Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub 2016-01-15 09:07:51 +11:00
stveep
ecf1aac5cb Added failure message to VO reset 2016-01-15 09:07:51 +11:00
Rob Harrington
4103ed0ba7 Combining variant override controller specs 2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41 Variant Overrides Index: User can manually reset inheritance 2016-01-15 09:07:51 +11:00
Rob Harrington
607a66b6c6 WIP: Fixing a few broken VO specs 2016-01-15 09:07:50 +11:00
Steve Pettitt
a3f7ff19b0 Add new VO fields to shopping spec 2016-01-15 09:07:50 +11:00
Steve Pettitt
0f4479aceb Back to original (current master) Rspec version 2016-01-15 09:07:50 +11:00
Steve Pettitt
1d38866f86 Add migration file to git repo 2016-01-15 09:07:50 +11:00
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
Steve Pettitt
75127f2a63 Fix feature specs for VO reset 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
Steve Pettitt
6c0dd7e25f Adding 'default_stock' to VariantOverride 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
3b7700131c Specify controller specs as such 2016-01-15 09:07:47 +11:00
Rob Harrington
14c8683535 Updating active_model_serializers 2016-01-15 09:07:47 +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
c33835e751 fixup whitespace 2016-01-13 16:23:14 +11:00
Maikel Linke
c4b0245399 Merge branch 'master' of https://github.com/marito59/openfoodnetwork into marito59-master 2016-01-13 16:07:21 +11:00
Maikel Linke
0c434c197b Making Travis fail if karma fails 2016-01-13 16:07:04 +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
Maikel Linke
00af6ef9de cleanup knapsack integration 2016-01-13 15:05:48 +11:00
Maikel Linke
7a998663b2 Knapsack report and test splitting 2016-01-13 15:05:48 +11:00
Maikel Linke
749061d60a knapsack report generation 2016-01-13 15:05:48 +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
Christian
01bf64e6b0 Allow delayed_job to use the locale defined for application 
delayed_job requires a different configuration variable for locale than
the application.

See
https://stackoverflow.com/questions/8478597/rails-3-set-i18n-locale-is-not-working
for reference
 2016-01-07 07:15:18 +01:00
Christian
839bf8794f Fix a hard cocded string on Order summary screen 
Created an order_pickup_time entry in locale files.
 2016-01-07 07:06:26 +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
ac650ebd46 Add support for mirroring Norway's database 2016-01-07 10:56:56 +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