JASON KNOEPFLER
c46fe7b675
encapsulate new unconfirmed email logic
2019-09-25 19:41:33 -07:00
JASON KNOEPFLER
4ec8fcd3a6
Assign flash message var from conditional return
2019-09-21 08:10:58 -07:00
JASON KNOEPFLER
07e0951490
Change users#update email change flash alert
2019-09-20 10:35:25 -07:00
Luis Ramos
ed1c154b78
Merge pull request #4252 from luisramos0/remove_clear_ship_address
...
On checkout of pickup orders, set ship_address to shipping_address_from_distributor instead of empty Spree::Address.default
2019-09-17 13:18:20 +01:00
Luis Ramos
46353be9a3
Merge pull request #4237 from coopdevs/unobfuscate-bulk-management-action
...
Add implicit #bulk_management including filter
2019-09-15 12:15:11 +01:00
Luis Ramos
500ef901fd
Merge pull request #4164 from luisramos0/little_de_deface
...
Remove some unused deface overrides and move some others to their views
2019-09-11 10:26:56 +01:00
Luis Ramos
1d177a164b
Merge pull request #4247 from mkllnk/4243-inventory-pagination
...
4243 Restore old pagination API for inventory products
2019-09-10 11:35:04 +01:00
luisramos0
fb65c64c68
Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
...
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
luisramos0
cc7461e692
Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
...
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize
In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
Maikel Linke
24c8bb95cb
Restore old pagination API for products
...
It's still used by the inventory page. This is an easy fix that I can
deploy without risk. A rewrite of the inventory pagination should
follow.
2019-09-09 14:53:04 +10:00
luisramos0
e9b5551c0f
Adpat shipment controller to move out of Spree namespace
2019-09-08 12:17:36 +01:00
luisramos0
7cec24f1d4
Move shipments route, controller and ctrl spec from spree/api to api
2019-09-08 12:17:36 +01:00
luisramos0
a21a4aba5d
Convert spree/api/shipments from rabl to AMS and adapt its spec
2019-09-08 12:15:33 +01:00
Pau Perez
55883a0efc
Add implicit #bulk_management including filter
...
OFN it's hard enough. No need to abuse implicitness making things very
hard to follow.
I've spent around 20min trying to find out where this controller action
was implemented until I realized Rails renders the matching view if no
controller action is defined.
Making it git-greppable makes it a bit easier next time.
2019-09-06 16:02:44 +02:00
Luis Ramos
e3ce2a7486
Merge pull request #4104 from luisramos0/convert_taxons_to_ams
...
Convert spree/api/taxons views from rabl to AMS
2019-09-06 00:04:10 +01:00
Matt-Yorkley
ff5fe66994
Fix route after big API refactor merge resolution
2019-09-02 16:29:03 +01:00
Matt-Yorkley
ff2db0c5f8
Update spec routes, namespacing, and test content
...
Resolving new issues after a big merge
2019-09-02 14:35:00 +01:00
Matt-Yorkley
4bec583bff
Refactor import_date_scope
2019-09-02 14:35:00 +01:00
Matt-Yorkley
90256f9c28
Add defaults and pages tests
2019-09-02 14:35:00 +01:00
Matt-Yorkley
eb284c1742
Use constants for defaults
2019-09-02 14:35:00 +01:00
Matt-Yorkley
b0ad0fccfa
Add some defaults to avoid returning zero values when not supplied in query
2019-09-02 12:00:32 +01:00
Matt-Yorkley
c127110192
Make import_date query modification conditional
2019-09-02 11:59:13 +01:00
Matt-Yorkley
0470725112
Refactor pagination data hash
2019-09-02 11:57:32 +01:00
Matt-Yorkley
0623bab084
Don't respond to a successful update by querying 500 arbitrary products
2019-09-02 11:56:00 +01:00
Matt-Yorkley
aeb8d30dae
Fix server-side import_date filtering
2019-09-02 11:56:00 +01:00
Matt-Yorkley
f6d0de1454
Improve pagination data in bulk products
2019-09-02 11:54:28 +01:00
Pau Pérez Fabregat
369a5a8a2f
Merge pull request #4101 from luisramos0/remove_variants_rabl
...
Convert spree/api/products and spree/api/variants views from rabl to AMS
2019-09-02 12:14:26 +02:00
luisramos0
92a270165e
Add missing api taxonomies controller only for the required jstree action
2019-08-28 22:06:56 +01:00
luisramos0
9f5c9916ba
Add back required api actions (create, update and destroy) and add AMS serializers for the jstree action
2019-08-28 22:06:56 +01:00
luisramos0
45bdb85bf3
Add missing method and skip_authorization_check to taxons controller
2019-08-28 22:06:56 +01:00
luisramos0
7a652fd67b
Adapt api/taxons controller to new namespace outside Spree: remove Spree module and add Spree namespace to Taxons and Taxonomy classes
2019-08-28 22:06:56 +01:00
luisramos0
4ca8feeef1
Move api/taxons route and controller out of spree namespace into /api and move the ctrl spec as well
2019-08-28 22:06:56 +01:00
luisramos0
367932a767
Make spree/api/taxons_controller use AMS serializer instead of rabl
2019-08-28 22:06:56 +01:00
luisramos0
e591658f48
Keep only used api/taxons index action, delete all others as not required right now
2019-08-28 22:06:56 +01:00
Luis Ramos
cd263b761c
Merge pull request #4055 from luisramos0/remove_spree_api
...
Remove dependency to spree_api - step 1 - controllers and routes
2019-08-28 15:34:08 +01:00
luisramos0
f97a3a030a
Remove unused nav_bar sessions route and override
2019-08-18 21:44:22 +01:00
luisramos0
2b8ebba233
Fix some rubocop issues in product_set and admin/products_controller
2019-08-17 19:15:32 +01:00
luisramos0
758394464b
Add bugsnag notification to products_controller create and update when on_hand or on_demand update fails with exception
2019-08-17 19:15:32 +01:00
luisramos0
b9ddb39edc
Re-add taxons jstree action to make taxonomies config page work again
2019-08-14 16:31:34 +01:00
Pau Pérez Fabregat
92b05c76a3
Merge pull request #4068 from luisramos0/replace_oc_rabl
...
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
Kristina Lim
752efac7cf
Merge pull request #4051 from luisramos0/subs_unpause
...
Sync subscription (create/update orders) when subscription is unpaused
2019-08-08 01:09:09 +08:00
Maikel
229e6fa0a3
Merge pull request #4073 from luisramos0/kill_more_rabl
...
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
2019-08-06 15:00:33 +10:00
Pau Pérez Fabregat
64d21969f0
Merge pull request #4064 from luisramos0/convert_search_Rabl
...
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
Pau Pérez Fabregat
6a41d9be87
Merge pull request #4092 from coopdevs/remove-admin-products-N+1
...
Remove N+1 while fetching distributors of OCs
2019-08-01 19:50:49 +02:00
luisramos0
4aa6c673ff
Adapt api products and variants controllers to new namespace outside of Spree
2019-08-01 18:34:19 +01:00
luisramos0
aa3c1aa0fe
Remove Spree module declaration from these files as they were moved out of the spree namespace
2019-08-01 14:30:11 +01:00
luisramos0
31bac9641f
Move api products and variants routes and ctrl out of spree namespace
2019-08-01 14:28:55 +01:00
luisramos0
6c054e6078
Add bulk_products and overridable to skip_authorization_check so these endpoints work with AMS
2019-07-31 12:18:27 +01:00
luisramos0
78ab852141
Make spree/api/products_controller work with AMS
2019-07-31 11:23:43 +01:00
luisramos0
4d74d246e8
Remove spree/api/products_controller index and new actions, not used
2019-07-31 10:32:45 +01:00
