luisramos0
|
665d0cc86b
|
Fix error related to missing _hamlout method by replacing code with standard haml
|
2019-07-16 20:16:32 +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
|
5ccadc1f7d
|
Convert spree/admin/shared/_head view from erb to haml
|
2019-07-16 20:16:32 +01:00 |
|
luisramos0
|
539805e2c2
|
Bring spree/admin/shared/head partial from spree_backend
|
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
|
e3c383c61c
|
Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs 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
|
24a9991162
|
Convert views/spree/layouts/admin.html from erb to haml
|
2019-07-16 20:16:31 +01:00 |
|
luisramos0
|
156ff2da89
|
Bring spree/layouts/admin from spree_backend to de-deface it
|
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 |
|
idanceinbetween
|
41b775b173
|
Remove multiline
|
2019-07-16 20:10:18 +01:00 |
|
idanceinbetween
|
35570feba0
|
Comment out new changes
|
2019-07-16 20:04:50 +01:00 |
|
idanceinbetween
|
1d8cfe59a2
|
Change hex value to variable
|
2019-07-16 19:37:08 +01:00 |
|
idanceinbetween
|
abd3efe82a
|
Replace lightgray to hex
|
2019-07-16 19:32:19 +01:00 |
|
idanceinbetween
|
389b53cb71
|
Add grey line below nav bar, change logo img max height 44px
|
2019-07-16 19:14:10 +01:00 |
|
luisramos0
|
4f60273198
|
Move temperature_controlled_form_element deface to shipping_categories form view
|
2019-07-16 14:50:16 +01:00 |
|
luisramos0
|
856fa8685a
|
Convert spree/admin/shipping_categories views from erb to haml
|
2019-07-16 14:48:47 +01:00 |
|
luisramos0
|
9ac4c0ba30
|
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
|
2019-07-16 14:46:26 +01:00 |
|
luisramos0
|
2709f237f5
|
Move image_format deface to image settings view
|
2019-07-16 14:44:38 +01:00 |
|
luisramos0
|
9db4edcd0d
|
Convert spree/admin/image_settings/edit.html from erb to haml
|
2019-07-16 14:43:20 +01:00 |
|
luisramos0
|
22c9f33f4c
|
Bring image_settings view from spree_backend
|
2019-07-16 14:39:14 +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
|
19f8f5c6fa
|
Convert general_settings/edit.html from erb to haml
|
2019-07-16 14:15:51 +01:00 |
|
luisramos0
|
83a306c31b
|
Convert class attributes to . notation in haml
|
2019-07-16 14:09:48 +01:00 |
|
luisramos0
|
d6020cdb6f
|
Bring general_settings/edit.html.erb from spree_backend to de-deface it
|
2019-07-16 13:57:35 +01:00 |
|
luisramos0
|
3b467dbae8
|
Adapt line_item_syncer to the case where item is not added to the completed order because of insufficient stock and the subscription quantity is updated for that item afterwards
|
2019-07-16 12:08:08 +01:00 |
|
luisramos0
|
306390440a
|
Revert "Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item"
This reverts commit d153e58933.
|
2019-07-16 11:00:21 +01:00 |
|
luisramos0
|
267131626e
|
Fix typo and add test case to cover out of stock case
|
2019-07-16 10:58:25 +01:00 |
|
Luis Ramos
|
2280b15664
|
Merge pull request #4035 from kristinalim/fix/4033-remove_line_item_adjustments_when_line_item_removed
4033 Remove line item adjustments when line item removed
|
2019-07-16 09:54:33 +01:00 |
|
luisramos0
|
e8127d81dc
|
Change how we display variant name in order edit page, use VariantAndLineItemNaming helper method
|
2019-07-15 18:37:19 +01:00 |
|
luisramos0
|
cd7906a57b
|
Move translations from Spree.t to root and add them to en.yml
|
2019-07-15 17:48:10 +01:00 |
|
luisramos0
|
02c573f146
|
Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button
|
2019-07-15 17:11:41 +01:00 |
|
luisramos0
|
112017a158
|
Remove variants/split partial from orders/shipments partial
In OFN we have one shipment per order so it doesnt make sense to split items between shipments
|
2019-07-15 17:07:33 +01:00 |
|
luisramos0
|
4a07d67037
|
Convert spree/admin/orders/_shipment partial from erb to haml
|
2019-07-15 16:42:45 +01:00 |
|
luisramos0
|
54156dfd32
|
Convert spree/admin/orders/_shipment_manifest partial from erb to haml
|
2019-07-15 16:42:19 +01:00 |
|
luisramos0
|
ee20d35487
|
Fix authorization issue in shipment actions, authorization was being done on a struct (shipment manifest), now it's done on the shipment itself
This is similar to https://github.com/spree/spree/pull/5624
|
2019-07-15 15:38:46 +01:00 |
|
luisramos0
|
be18244abc
|
Bring views/spree/admin/orders/_shipment and views/spree/admin/orders/_shipment_manifest from spree backend
|
2019-07-15 15:37:24 +01:00 |
|
luisramos0
|
02099ebdae
|
Remove details about stock in line_item_syncer so that we avoid confusing the user with stock numbers, this way the user will know what is the problem and can check stock levels and the order for more details
|
2019-07-14 21:40:57 +01:00 |
|