raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,934 Commits 21 Branches 450 Tags
f9acee2be428fa6f5fcebec7bc511f45897a1f3d
Commit Graph

661 Commits

Author SHA1 Message Date
Rob Harrington
f9acee2be4 Shipping methods can be tagged 2016-04-01 19:48:25 +11:00
Rob Harrington
86c80124fc Moving tags-with-translation directive to admin.utils 2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4 Renaming angular admin.shipping_methods and admin.payment_methods modules 2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e Renaming shippingMethodCtrl to shippingMethodsCtrl 2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591 Relevant DiscountOrder tag rules are applied to orders on update 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf Enterprise users can create tag rules 2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f First cut at an interface for updating tag rules 2016-04-01 19:48:25 +11:00
Maikel Linke
17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances 
Applied code conventions.

Conflicts:
	config/locales/en.yml
 2016-03-30 13:30:44 +11:00
Maikel Linke
31302fb930 Translate unsaved products message correctly 2016-03-23 17:57:22 +11:00
Maikel Linke
51f94119ff Restore links_dropdown 2016-03-11 16:39:07 +11:00
Maikel Linke
ac88817a34 Add translation for unsaved_changes_warning 2016-03-11 15:46:29 +11:00
Maikel Linke
2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon 
Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb
 2016-03-11 15:38:28 +11:00
Maikel Linke
711f525d98 Remove   from locale en.yml 2016-03-11 14:45:43 +11:00
Maikel Linke
b7320a0bd7 Translate "Price" in Bulk Order Management 2016-03-11 12:48:35 +11:00
Maikel Linke
071ee9ab54 Add brackets to t call in js line items controller 
The missing brackets made all columns of the bulk order management
invisible.

Also removed trailing whitespaces.
 2016-03-09 18:39:23 +11:00
Rob Harrington
aff346071f Automatically selecting a hub on inventory page when it is the only option 2016-03-02 12:10:49 +11:00
Rob Harrington
3f466e86b6 Renaming 'Override Variant Details' permission to 'Add Products To Inventory' 
Style changes to make enterprise relationships page more useable
 2016-03-02 12:10:49 +11:00
Rob Harrington
6ee4e4190e New product count for inventory takes permissions into account 2016-03-02 12:10:22 +11:00
Rob Harrington
f288c09380 Moving inventory settings to their own section within the enterprise edit form 2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb Adding global config to allow shop users to only select from inventory variants in OC interface 2016-03-02 12:10:22 +11:00
Rob Harrington
28b143da73 WIP: Splitting Variant overrides into views 2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522 WIP: Adding Loading flash to variant overrides page 2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68 WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited 2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23 WIP: Adding infrastructure to show/hide variants + overrides using inventory items 2016-03-02 12:10:22 +11:00
Rob Harrington
caa8818f02 Adding option to 'Inherit From Product' for enterprise_fee tax categories 2016-03-02 11:56:46 +11:00
Rob Harrington
a66582a8fb WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model 2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0 Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising 2016-03-02 11:56:46 +11:00
Nicolas Blanc
4621f625a0 new validation6 02/25/2016 2016-02-25 12:36:21 +00:00
Rohan Mitchell
6193bb896b Sanitize input for ofnTaxonAutocomplete and userSelect directives 2016-02-24 11:26:38 +11:00
Rohan Mitchell
4314bfb99c Fix karma fail due to file load order change 2016-02-24 11:26:38 +11:00
Rohan Mitchell
ae03170984 Sanitize input for ofn-select2 2016-02-24 11:26:38 +11:00
Rohan Mitchell
977ff7b35d Fix compatibility issues with new version of select2 2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a Replace with-tip with ofn-with-tip: misc 2016-02-24 11:26:37 +11:00
Rohan Mitchell
b4976a5445 Replace with-tip with ofn-with-tip: enterprise forms 2016-02-24 11:26:37 +11:00
Rohan Mitchell
e2722710de Clean up syntax 2016-02-24 11:26:37 +11:00
Rohan Mitchell
45d4dd6b88 Add ofnWithTip directive to sanitise HTML going into tooltips 2016-02-24 11:26:37 +11:00
Rohan Mitchell
6a2e07064b Fix stomped spree JS file 2016-02-24 11:26:37 +11:00
Nicolas Blanc
c91eb9f345 new validation3 02/22/2016 2016-02-22 14:31:31 +00:00
Nicolas Blanc
44508f0f1e new validation2 02/22/2016 2016-02-22 13:38:19 +00:00
Nicolas Blanc
1738db9e1f new validation 02/22/2016 2016-02-22 13:00:27 +00:00
Nicolas Blanc
614f83799e new test 2016/02/20 2016-02-20 19:23:22 +00:00
Nicolas Blanc
2be005d344 i18n from berlin hackathon 2016-01-31 12:16:33 +00:00
Maikel
eeb31f65c3 Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment. 2016-01-15 16:15:09 +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
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
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
0ee078e232 Added toggle to enable/disable reset stock. Updated specs 2016-01-15 09:07:48 +11:00