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 |
|
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 |
|
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 |
|
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 |
|
Luis Ramos
|
39475be792
|
Merge pull request #4030 from Matt-Yorkley/line_item_errors
LineItems can always access soft-deleted variants
|
2019-07-12 16:33:36 +01:00 |
|
Pau Pérez Fabregat
|
bdeb56bfaf
|
Merge pull request #4028 from openfoodfoundation/transifex
Transifex
|
2019-07-11 17:28:38 +02:00 |
|
Matt-Yorkley
|
fb4e573cfa
|
Add a soft-deleted test in line_item_spec
|
2019-07-11 16:07:30 +01:00 |
|
Transifex-Openfoodnetwork
|
e65df31bc3
|
Updating translations for config/locales/nl_BE.yml
|
2019-07-12 00:29:50 +10:00 |
|
Transifex-Openfoodnetwork
|
ce1ac57522
|
Updating translations for config/locales/de_DE.yml
|
2019-07-11 23:53:17 +10:00 |
|
Transifex-Openfoodnetwork
|
09ff57d462
|
Updating translations for config/locales/en_BE.yml
|
2019-07-11 23:50:31 +10:00 |
|
Transifex-Openfoodnetwork
|
542cf0cf4f
|
Updating translations for config/locales/fr_BE.yml
|
2019-07-11 23:43:29 +10:00 |
|
Transifex-Openfoodnetwork
|
f4113745ce
|
Updating translations for config/locales/fr.yml
|
2019-07-11 23:11:32 +10:00 |
|
Transifex-Openfoodnetwork
|
6d197c53e0
|
Updating translations for config/locales/en_ZA.yml
|
2019-07-11 21:40:38 +10:00 |
|
Matt-Yorkley
|
b2c6e6271c
|
LineItems can always access soft-deleted variants
|
2019-07-11 11:33:34 +01:00 |
|
Luis Ramos
|
cdd36eeefc
|
Merge pull request #3674 from Matt-Yorkley/spree2/import_description
Allow import to proceed when updating a product and `description` is set
|
2019-07-10 21:09:30 +01:00 |
|
Matt-Yorkley
|
97148f6f57
|
Send embedded Stripe javascript to :injection_data
|
2019-07-10 19:28:20 +01:00 |
|
Matt-Yorkley
|
6219b3f0c3
|
Revert "Revert "Fix JS render-blocking in Darkswarm""
This reverts commit ffeca41e
|
2019-07-10 17:14:08 +01:00 |
|
Transifex-Openfoodnetwork
|
d66cac7a26
|
Updating translations for config/locales/ca.yml
|
2019-07-10 21:20:51 +10:00 |
|
Transifex-Openfoodnetwork
|
07c11b9b1f
|
Updating translations for config/locales/es.yml
|
2019-07-10 21:18:28 +10:00 |
|
Transifex-Openfoodnetwork
|
6a232a1f36
|
Updating translations for config/locales/ca.yml
|
2019-07-10 21:17:43 +10:00 |
|
Maikel
|
1a61357be8
|
Merge pull request #4024 from openfoodfoundation/transifex
Transifex
v2.2.0
|
2019-07-10 11:17:12 +10:00 |
|
Maikel
|
b2eeb5d687
|
Merge pull request #4025 from openfoodfoundation/revert-3988-js_render_blocking
Revert "Fix JS render-blocking in Darkswarm"
|
2019-07-10 11:00:17 +10:00 |
|
Maikel
|
ffeca41ef4
|
Revert "Fix JS render-blocking in Darkswarm"
|
2019-07-10 10:24:25 +10:00 |
|
Transifex-Openfoodnetwork
|
68c0936766
|
Updating translations for config/locales/en_GB.yml
|
2019-07-10 04:39:47 +10:00 |
|
Luis Ramos
|
23b6267e30
|
Merge pull request #3916 from luisramos0/schedules_of_coordinator
OC schedules are now filtered to schedules of OCs with same coordinator
|
2019-07-09 14:21:34 +01:00 |
|
Luis Ramos
|
6872ccfb72
|
Merge pull request #3963 from luisramos0/hide_invoices
Hide invoices feature
|
2019-07-09 14:20:50 +01:00 |
|
luisramos0
|
b1b791e4ee
|
Update all locales with the latest Transifex translations
|
2019-07-09 14:19:35 +01:00 |
|
Luis Ramos
|
1779b759f7
|
Merge pull request #4017 from openfoodfoundation/transifex
Transifex
|
2019-07-09 14:15:38 +01:00 |
|
Transifex-Openfoodnetwork
|
3ebbf5a55d
|
Updating translations for config/locales/fr.yml
|
2019-07-09 22:42:05 +10:00 |
|
Luis Ramos
|
83ce2ac3dc
|
Merge pull request #3988 from Matt-Yorkley/js_render_blocking
Fix JS render-blocking in Darkswarm
|
2019-07-09 12:30:30 +01:00 |
|
Luis Ramos
|
aaf850a095
|
Merge pull request #4010 from luisramos0/fuubar_upgrade
Apply 2.1.1 hotfix to master
|
2019-07-09 12:24:54 +01:00 |
|
Luis Ramos
|
3e9bf8aa1f
|
Merge pull request #3964 from openfoodfoundation/hand-soft-deleted-products-in-orders-and-fulfillment-report
Handle soft deleted products in orders and fulfillment report
|
2019-07-09 12:19:28 +01:00 |
|
luisramos0
|
95832c96ac
|
Delete redundant spec, this case is now covered in a view spec
|
2019-07-09 09:15:38 +01:00 |
|
Luis Ramos
|
8a700307d2
|
Merge pull request #3992 from Matt-Yorkley/cart_button_bug
Fix display bug in cart button on mobile menu
|
2019-07-08 18:33:36 +01:00 |
|
Luis Ramos
|
1756ddd0e9
|
Merge pull request #3989 from Matt-Yorkley/preload_primary_font
Preload primary font to speed up page rendering
|
2019-07-08 17:43:15 +01:00 |
|
Luis Ramos
|
fe71781d70
|
Merge pull request #3791 from jazzdragon/1766-registration-scroll
1766 registration scroll
|
2019-07-08 15:10:35 +01:00 |
|
Luis Ramos
|
ec65951ef3
|
Merge pull request #3959 from jonleighton/issue-1848
Edit tooltip text to make it readable
|
2019-07-08 15:09:11 +01:00 |
|
Transifex-Openfoodnetwork
|
633c7737e4
|
Updating translations for config/locales/en_ZA.yml
|
2019-07-08 04:04:48 +10:00 |
|
Pau Perez
|
f42bf72b32
|
Fix rubocop violations
It's not affordable to fix the failed Metrics cops in the scope of this
bug fix, but now, with a separate class, it'll be easier.
|
2019-07-05 18:19:58 +02:00 |
|
Pau Perez
|
8ab77b077b
|
Fix spec
This needs to be revisited. I'm not sure it's the most appropriate spec
as it seems to be testing just part of story.
|
2019-07-05 18:19:58 +02:00 |
|
Pau Perez
|
9b03833df0
|
Extract orders & fulfillments default report clasts
|
2019-07-05 18:19:58 +02:00 |
|