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 |
|
Kristina Lim
|
77c78f35d3
|
Update all locales with the latest Transifex translations
v2.2.1
|
2019-07-16 18:53:24 +08: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 |
|
Transifex-Openfoodnetwork
|
f843a0b4d9
|
Updating translations for config/locales/en_AU.yml
|
2019-07-16 17:08:24 +10:00 |
|
Transifex-Openfoodnetwork
|
965a274332
|
Updating translations for config/locales/en_AU.yml
|
2019-07-16 17:05:40 +10:00 |
|
Transifex-Openfoodnetwork
|
cb2a842746
|
Updating translations for config/locales/en_AU.yml
|
2019-07-16 17:05:17 +10:00 |
|
luisramos0
|
a6655623d0
|
New admin orders edit view spec and workaround (current_ability) to make view specs work
|
2019-07-15 21:59:36 +01:00 |
|
luisramos0
|
2a2d05ad39
|
First view spec in OFN testing the print invoice button display in the orders list page
|
2019-07-15 21:59:36 +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 |
|
luisramos0
|
d153e58933
|
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
|
2019-07-14 20:59:42 +01:00 |
|
luisramos0
|
c2a59a374c
|
Fix rubocop issues by simplifying method
|
2019-07-14 17:21:15 +01:00 |
|
luisramos0
|
2a1011921b
|
Reuse line_item_syncer.add_order_update_issue in line_item_syncer.update_item_quantities to add stock info to the update_quantity order issues
|
2019-07-14 16:43:46 +01:00 |
|
luisramos0
|
df27ee0d3e
|
Refactor line_item_syncer.add_order_update_issue out of line_item_syncer.create_new_items
|
2019-07-14 16:06:09 +01:00 |
|
luisramos0
|
c2851015ce
|
Fix deleting created item (destroy doesnt work before save) and add order_update_issue with message so that user can understand what happened
|
2019-07-14 15:58:00 +01:00 |
|
luisramos0
|
d0c246c345
|
Fix some rubocop issues
|
2019-07-14 12:28:32 +01:00 |
|
Kristina Lim
|
e58546a412
|
Move offcanvas menu content to separate partial
|
2019-07-14 13:52:47 +08:00 |
|
luisramos0
|
6aed9ba549
|
Make line_item_syncer delete new line items if stock is insufficient
|
2019-07-13 22:57:13 +01:00 |
|
luisramos0
|
4f2bc33ec3
|
Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed
|
2019-07-13 20:56:34 +01:00 |
|
luisramos0
|
0f3404ca27
|
Rename order_syncer.future_and_undated_orders to explicitly include completed orders from current OC: orders_in_order_cycles_not_closed
|
2019-07-12 22:20:09 +01:00 |
|
Kristina Lim
|
2c279fd02d
|
Remove line item adjustments if line item deleted
|
2019-07-13 03:58:01 +10:00 |
|
Kristina Lim
|
8a048cc155
|
Add proof line item adjustments remain after line item removal
|
2019-07-13 01:43:07 +08:00 |
|
Luis Ramos
|
b3c378e8c1
|
Merge pull request #4029 from Matt-Yorkley/js_render_blocking2
Js render blocking 2
|
2019-07-12 16:34:31 +01:00 |
|