Luis Ramos
340b92e580
Merge pull request #3700 from luisramos0/2-0-without-auth-devise
...
Remove dependency to spree_auth_devise
2019-07-26 10:57:38 +01:00
Luis Ramos
7245d1eff4
Merge pull request #4049 from luisramos0/deface_admin_orders
...
De-deface admin orders adjustments page and customer details page
2019-07-24 21:59:08 +01:00
luisramos0
a75a0da981
Remove unused deface in spree/admin/orders/show, this action doesnt exist in ofn v2
2019-07-16 21:12:48 +01:00
luisramos0
5744240f91
Move customer_details/_form defaces to the view
2019-07-16 21:12:09 +01:00
luisramos0
873c56a642
Move customer_details/edit/replace_customer_search deface to view
2019-07-16 21:09:48 +01:00
luisramos0
f9861fee79
De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view
2019-07-16 21:01:08 +01:00
luisramos0
d8ae97f923
Move spree/admin/adjustments/_form/add_tax_rate deface to view
2019-07-16 20:53:24 +01:00
luisramos0
a34d8a3f20
Revert "Move app_wrapper deface to spree/layouts/admin view"
...
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
2019-07-16 20:16:32 +01:00
luisramos0
6e35701dd6
Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view
2019-07-16 20:16:32 +01:00
luisramos0
9991458d2a
Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used
2019-07-16 20:16:32 +01:00
luisramos0
a843fd73b7
Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view
2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908
Move admin/shared/_head/replace_spree_title deface to head view
2019-07-16 20:16:32 +01:00
luisramos0
fac64ef5bf
Remove layouts/spree_application/inside_head deface, this view is in spree_frontend which is not used in ofn anymore
2019-07-16 20:16:32 +01:00
luisramos0
a17a0a62bc
Move spree/layouts/bare_admin/add_login_nav deface to layout/bare_admin view
2019-07-16 20:16:32 +01:00
luisramos0
1e91de106f
Move admin html head deface to layout admin view and remove repeated (in shared/head partial) content type tag
2019-07-16 20:16:32 +01:00
luisramos0
73252132a6
Move add_i18n_script deface to layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
aafb134be7
Move spree/layouts/admin/ tabs deface to spree/layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
70a1996435
Move add_currency_config deface to spree/layout/admin view
2019-07-16 20:16:31 +01:00
luisramos0
1712cb2617
Move app_wrapper deface to spree/layouts/admin view
...
In admin layout, only adds a div after the body tag.
2019-07-16 20:16:31 +01:00
luisramos0
25df057d05
Move spree/layouts/admin/add_analytics deface to spree/layouts/admin view
2019-07-16 20:16:31 +01:00
luisramos0
e36b4ed01a
Move temp_controller_list deface to shipping_categories index view
2019-07-16 20:16:23 +01:00
luisramos0
4f60273198
Move temperature_controlled_form_element deface to shipping_categories form view
2019-07-16 14:50:16 +01:00
luisramos0
2709f237f5
Move image_format deface to image settings view
2019-07-16 14:44:38 +01:00
luisramos0
24ea2a4398
Move number_localization deface to general settings view
2019-07-16 14:28:47 +01:00
luisramos0
8178f5388c
Move legal settings deface to general settings view
2019-07-16 14:27:32 +01:00
luisramos0
c0c5e9d7dd
Move embedded_shopfronts deface to general settings view
2019-07-16 14:26:33 +01:00
luisramos0
dcbdfbb081
Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets
2019-07-08 11:22:56 +01:00
luisramos0
f557996817
Add deface overrides from spree_auth_devise for the users menu tab, the admin top bar and the shared login bar (maybe dead code this last one)
2019-07-06 22:53:20 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
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
Pau Pérez Fabregat
87f0ddabe7
Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features
...
[Spree Upgrade] Remove unused spree v2 features
2019-03-22 10:35:15 +01: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
60ee17204b
Merge branch 'master' into 2-0-stable-Mar16
2019-03-16 16:17:38 +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
Pau Pérez Fabregat
2dd55770fe
Merge pull request #3569 from luisramos0/delete-more-overrides
...
Delete some more dead overrides and more dead code
2019-03-12 17:48:12 +01: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
Pau Pérez Fabregat
b330db3b4b
Merge pull request #2947 from Matt-Yorkley/pi/submenu_link
...
Pi/submenu link
2019-03-05 14:49:02 +01:00
luisramos0
93e13742be
Delete some more dead overrides. We are not using spree/checkout (except for /checkout/payment) nor spree/products
2019-03-01 23:56:03 +00:00
Maikel
c472d2fbbe
Merge pull request #3498 from luisramos0/delete-dead-overrides
...
Remove dead overrides
2019-02-28 10:25:42 +11: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
