Kristina Lim
a261d912ea
Simplify order sync logic for shipping methods
2019-03-13 12:45:54 +08:00
Kristina Lim
9316096d4d
Fix updating of the shipping method for an order
2019-03-13 12:45:54 +08:00
Kristina Lim
5b5d1967fd
Fix queries for pending order shipment in OrderSyncer
2019-03-13 12:45:53 +08:00
Kristina Lim
54991f8191
Retain shipping method when transitioning order
2019-03-13 12:45:53 +08:00
Kristina Lim
7a8bf76123
Move transitioning of order in admin/orders#edit to service
2019-03-13 12:45:50 +08:00
Kristina Lim
ce5691d080
Copy admin/orders#edit from Spree controller
...
This method needs to be updated to use custom order advance logic in
service.
2019-03-12 18:31:27 +08:00
Kristina Lim
f42eb3dab1
Create shipment when creating a order for a subscription
...
A spec has been added to check that the attributes for the order states
after "cart" ("address", "delivery", "payment") are retained if the
order is transitioned to completion, BUT currently this is passing
because it is the only shipping method available.
2019-03-12 18:31:27 +08:00
Kristina Lim
0306cc7ca7
Set shipping method when creating order for subscription
2019-03-12 18:31:26 +08:00
luisramos0
61f1bf5ec8
Fix shipping_methods edit page missing translation
2019-03-07 17:15:06 +00:00
luisramos0
2470830ec8
Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui
2019-03-06 11:28:50 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
7e06807a11
Merge pull request #3539 from Matt-Yorkley/subs/confirmation_email
...
Don't process proxy_order if the order has been cancelled
2019-03-05 17:38:29 +01: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
30bbc5ee6f
Merge pull request #3472 from pacodelaluna/fix-datetime-picker
...
Fix datetime picker on Order Cycle form
2019-03-05 14:50:34 +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
Luis Ramos
72e9c1d002
Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices
...
[Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again
2019-03-04 15:54:09 +00:00
Maikel
a14c785e69
Merge pull request #3435 from Matt-Yorkley/bug/tmpfile
...
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-03-01 10:20:26 +11:00
Pau Pérez Fabregat
88e6fa84a2
Merge pull request #3534 from luisramos0/registration_trans_all
...
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-28 17:15:09 +01:00
Maikel Linke
958e98debd
Document stock validation of variant overrides
2019-02-28 12:21:26 +11:00
Maikel
824beba066
Merge pull request #3505 from luisramos0/vo-false
...
Adapt scope_variant_to_hub to new VO rules where on_demand=nil means use_producer_settings
2019-02-28 10:26:23 +11: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
25e2d2adda
Update references to product_sub_menu view
2019-02-26 20:06:01 +00:00
Matt-Yorkley
777850259b
Apply and delete overrides
2019-02-26 19:42:47 +00:00
Matt-Yorkley
f1e55507c3
Recreate product_sub_menu Spree view
2019-02-26 19:42:47 +00:00
luisramos0
a0594f7616
Re-add invoice settings controller removed by mistake
2019-02-26 14:14:17 +00:00
luisramos0
a36722cebf
Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand
2019-02-26 12:47:11 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
François Turbelin
68fd6de39b
Update Jquery datetimepicker lib to v1.6.3
2019-02-25 22:22:27 +01:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat
8a855edbda
Merge pull request #3527 from luisramos0/2-0-fix-admin-edit-order-page
...
[Spree Upgrade] Fix edit ship method and tracking number in backoffice order page
2019-02-25 12:20:46 +01:00
Pau Pérez Fabregat
aed9c41b0d
Merge pull request #3394 from mkllnk/3021-update-soft-delete
...
[Spree upgrade] 3021 update soft delete
2019-02-25 11:58:41 +01:00
Matt-Yorkley
627b101be9
Don't process proxy_order if the order has been cancelled
2019-02-24 12:06:58 +00:00
luisramos0
ee8fe4b6b4
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-22 14:37:45 +00:00
luisramos0
0b1ea1beda
Rename VariantOverride.use_producer_settings to VariantOverride.use_producer_stock_settings
2019-02-22 09:57:21 +00:00
luisramos0
45e5fed609
Improve scope_variant_to_hub code and spec by testing an invalid data state
2019-02-21 11:25:01 +00:00
luisramos0
b73ca88811
Fix edit ship method and tracking number in backoffice order page
...
The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons
2019-02-20 23:57:57 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
Luis Ramos
34acaa4e03
Merge pull request #3425 from mkllnk/2783-product-importer-spec
...
Apply import defaults to variants of new products in Spree 2
2019-02-20 13:34:57 +00:00
Matt-Yorkley
f73221ed85
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-02-20 13:10:47 +00:00
luisramos0
ef786adcfc
Make variant_override.stock_overridden? simpler and add comment to explain relationship between count_on_hand and on_demand in a VO
2019-02-20 13:07:21 +00:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
Maikel Linke
99f0be2f1c
Remove unnecessary scope Variant.not_deleted
...
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.
Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
Maikel Linke
b4d1e48693
Update soft-delete of variants
...
Spree changed their way of soft-deleting variants from calling `delete`
to calling `destroy`. We don't need our own implementation any more.
2019-02-19 14:25:18 +11:00
Maikel Linke
cdb49f88b0
Move Variant deletion into its own service
...
This keeps the override of Spree's model leaner. More importantly, it
prepares us for using `destroy` instead of `delete`.
In the past, `Product#delete` soft-deleted the product, but didn't
delete the variants. When we use `Product#destroy` to soft-delete the
product, it will also call destroy on the variants. If the model doesn't
allow the deletion of the last variant, it will fail. So when a product
is deleted we want to allow the deletion of all variants. But the user
should not be allowed to delete the last variant. That's why I'm moving
the check to the controller level.
Related commits:
- e6c7acdff32b47c9145ab9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)
2019-02-19 14:25:18 +11:00
Maikel Linke
8f49f0006a
Update products controller decorator with Spree
...
Spree changed the controller to deal with the updated soft-delete. This
commit brings these changes to our decorator.
2019-02-19 14:25:18 +11:00
Maikel Linke
5d828bd7ae
Update soft-delete of products
...
Spree changed their way of soft-deleting products, variants and
some other models. `#destroy` is now soft-deleting and replaces
`#delete`.
This commit considers only products. Variants will follow in another
commit. The other models can be ignored, because we don't call `delete`
on them.
2019-02-19 14:25:18 +11:00
Maikel
1b45033e33
Merge pull request #3506 from Matt-Yorkley/pi/parse_bom
...
Sanitize non-parsable BOM characters inserted by Excel
2019-02-19 11:24:11 +11:00
Maikel
be59a8ce32
Merge pull request #3434 from Matt-Yorkley/pi/fix_hash_merge
...
Fix hash merge for recording already created products by name
2019-02-19 11:21:49 +11:00
