Luis Ramos
17f126d80c
Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page
...
Add display_name and display_as to admin edit variant page
2019-05-05 11:31:27 +01:00
stveep
7090281da5
Reorganise defaces so that display name fields come first
2019-05-04 21:48:32 +01:00
stveep
a959702905
Add display_name and display_as to admin edit variant page
2019-05-04 17:20:12 +01:00
kkoomin
f65ce82778
changed string into translation key & add 'infinity' key
2019-05-04 14:40:45 +01:00
luisramos0
5e64c9f392
Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management"
2019-04-02 16:58:50 +01:00
Luis Ramos
9a771ecbb8
Merge pull request #3613 from luisramos0/2-0-update-variants-stock
...
[Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages
2019-03-26 08:55:34 +00:00
luisramos0
78ea16c684
Remove unnecessary data-hooks from stock management deface override
2019-03-22 21:30:25 +00:00
luisramos0
21a10d0206
Add on_hand and on_demand back to variants form (both variant create and edit pagei), this is where they used to be in spree v1
...
The admin variants controller create action is adapted (same as in the admin ProductsController). This is necessary because variant.on_hand and on_demand cannot be mass assigned on creation in v2, see VariantStock for more details.
For now we are hiding the new stock management page that comes in spree v2 as we don't need the complexity added by the management of stock per stock location (only one stock location in ofn v2 for now)
2019-03-18 19:02:48 +00:00
luisramos0
9194a711ea
De-deface product tabs
...
We do not include stock management from v2 because we will use the variants edit page to manage on_hand and on_demand
2019-03-18 18:47:25 +00:00
luisramos0
2295981375
Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features
2019-03-12 16:55:48 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
3ddee83be5
Merge pull request #3404 from luisramos0/2-0-disable-cache
...
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
Matt-Yorkley
777850259b
Apply and delete overrides
2019-02-26 19:42:47 +00:00
luisramos0
ebf825e349
De-deface configuration menu
...
Remove stock locations and stock transfers from the menu
2019-02-25 23:38:50 +00:00
luisramos0
8a59e06d36
Remove buttons 'open/close all adjustments' from order adjustments edit page
...
We may re-add this feature in the future, we are not introducing the capacity to open/close adjustments in OFN. See https://github.com/openfoodfoundation/openfoodnetwork/issues/1830 for context
2019-02-25 16:42:22 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
luisramos0
1b4666fc6a
Add checkbox to cache settings to disable products cache
2019-02-07 20:06:27 +00:00
luisramos0
698ba4618d
Adapt customer search override to spree v2 and fix customer details spec in admin orders spec
2019-02-04 18:58:02 +00:00
luisramos0
676f0e71b8
Fix variant edit page optiontype deface code
2019-01-07 12:16:47 +00:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Hugo Daniel
aa948552e1
Import payment_methods edit view and apply overrides
2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6
Import payment_methods form partial and apply overrides
2018-11-29 14:58:06 +01:00
Hugo Daniel
29bc4c52a5
Import payment_methods#new view and apply overrides
2018-11-29 14:56:28 +01:00
Hugo Daniel
c233ea38cf
Import Spree views for orders#edit in our codebase and integrate deface modifications
2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat
5c8a638320
Merge pull request #3055 from HugsDaniel/3051-products-edit-views
...
[Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides
2018-11-27 17:32:25 +01:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Hugo Daniel
1309d80f65
Import products#edit and form partial in our codebase and apply overrides
2018-11-15 17:39:36 +01:00
Hugo Daniel
094d88d03a
Import products#new view into our codebase and apply overrides
2018-11-15 16:35:31 +01:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Maikel
267edbdb45
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
...
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-25 11:37:46 +10:00
Pau Pérez Fabregat
3c4ec62352
Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
...
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-21 16:16:25 +02:00
Pau Pérez Fabregat
33fa687c28
Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
...
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-21 15:35:41 +02:00
Hugo Daniel
f9c5e732d8
Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-20 19:21:02 +02:00
Hugo Daniel
56c1b073ee
Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378
Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c
Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-20 12:34:16 +02:00
Maikel
eabb9f4574
Merge pull request #2659 from kristinalim/translations-admin_area_fixes
...
Simple translation fixes for admin area and profile page
2018-09-14 14:38:25 +10:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Kristina Lim
9dcdb67352
Translate inherits_properties label in product form
2018-09-08 01:37:57 +08:00
stveep
c0f41b6833
PR changes - erb to haml, don't update en_GB translations
2018-08-19 10:43:53 +01:00
stveep
a848b9172e
Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages
2018-08-19 10:43:53 +01:00
stveep
8272aebe29
Add Stripe form and duplicate Stripe Elements in backend Angular app
2018-08-19 10:43:53 +01:00
luisramos0
4b64369ddb
Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)
2018-08-14 10:01:48 +10:00
