luisramos0
e79c672263
Convert spree/admin/tax_categories from erb to haml
2019-09-20 15:36:54 +01:00
luisramos0
bc6f7934e0
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 15:35:49 +01:00
luisramos0
89029f46f9
Fix basic rubocop issues in newly added controller
2019-09-20 15:32:34 +01:00
luisramos0
144369e55f
Add tax related controllers from spree_backend related to config
2019-09-20 15:31:30 +01:00
luisramos0
c66579a22f
Fix simple rubocop issues in helper
2019-09-20 15:24:06 +01:00
luisramos0
9291bf5c82
Bring taxons_helper from spree
2019-09-20 15:24:06 +01:00
luisramos0
def9ab7c47
Convert spree/admin/taxons from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2a68d34fb0
Convert spree/admin/taxonomies from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2ce56aef2c
Add spree_backend views related to admin/configuration taxonomies that are missing in ofn
2019-09-20 15:23:45 +01:00
luisramos0
20f965731d
Fix basic rubocop issues in recently added controller from spree_backend
2019-09-20 15:14:34 +01:00
luisramos0
8378dce752
Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step
2019-09-20 15:13:45 +01:00
luisramos0
d7a4e3a896
Add taxonomies controller from spree_backend
2019-09-20 15:12:38 +01:00
luisramos0
4a83eca832
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:05:21 +01:00
luisramos0
32c1eecece
Convert spree/admin/zones from erb to haml
2019-09-20 15:01:06 +01:00
luisramos0
6d8c7a4bee
Fix minor detail in states and countries views
2019-09-20 14:57:48 +01:00
luisramos0
bd2045cad7
Convert spree/admin/states from erb to haml
2019-09-20 14:55:36 +01:00
luisramos0
e1c3d2442a
Convert spree/admin/countries from erb to haml
2019-09-20 14:55:10 +01:00
luisramos0
3df65d0463
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 14:54:55 +01:00
luisramos0
822a17f732
Fix basic rubocop issues in newly added controllers
2019-09-20 14:50:38 +01:00
luisramos0
ffde0307e2
Add controllers from spree_backend related to config
2019-09-20 14:50:01 +01:00
Luis Ramos
746c4f03f6
Merge pull request #4261 from jasonk357/3979-malformed-referer-error
...
Guard against malformed request referer
2019-09-19 17:29:18 +01:00
Kristina Lim
3535c4d564
Merge pull request #4240 from Matt-Yorkley/backorder_to_the_future_2
...
Disentangle on_demand and backordered
2019-09-20 00:05:27 +08:00
luisramos0
bdb3dd5aaf
Fix long lines in app/serializers
2019-09-19 16:32:09 +01:00
luisramos0
25fbab2e37
Use memoized order method
2019-09-19 16:32:09 +01:00
luisramos0
a44a251d96
Remove duplicated attributes tag from all serializers to create consistency
2019-09-19 16:32:09 +01:00
luisramos0
2921ee19e1
Add api/order/{order_number} ednpoint and its new order detailed serializer
2019-09-19 16:32:09 +01:00
luisramos0
6796d91a07
Add some basic attributes to address and order serializers that will be used in the order show api endpoint
2019-09-19 16:32:09 +01:00
luisramos0
69afcf7510
Improve readability in order permissions
2019-09-19 16:32:09 +01: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
e7e4508555
Merge pull request #4242 from Matt-Yorkley/another_cartastrophe
...
Soft-delete price objects
2019-09-16 17:18:39 +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
JASON KNOEPFLER
91a52ead58
Guard against malformed request referer
2019-09-14 09:13:44 -07:00
luisramos0
377b4a3755
Do not add ng-controller if main_ng_ctrl_name is not set
2019-09-11 10:36:19 +01:00
luisramos0
0c809b2911
Remove now unused override app_wrapper
2019-09-11 10:35:39 +01:00
luisramos0
33472014f1
Do not add main_ng_app_name if it is not defined
2019-09-11 10:32:30 +01:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
luisramos0
3d718d9738
Move admin layout body contents to a separate partial
2019-09-11 10:32:29 +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
Luis Ramos
936784404e
Merge pull request #4112 from luisramos0/convert_shipments_rabl
...
Convert spree/api/shipments views from rabl to ams
2019-09-09 18:34:02 +01:00
Matt-Yorkley
4656c35f71
Don't change on_demand variant's stock when updating shipments
2019-09-09 17:49:58 +01:00
Matt-Yorkley
254315b79e
Don't mark on_demand items and shipments as "backordered"
2019-09-09 17:49:56 +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
Luis Ramos
2dc85463ce
Merge pull request #4226 from HugsDaniel/4090-missing-translations-order
...
Add missing translations for orders
2019-09-09 15:16:47 +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
26f5ece7c0
Add a few relevant attributes to shipment serializer and fix some details in shipment controller spec
2019-09-08 12:15:33 +01:00
luisramos0
a21a4aba5d
Convert spree/api/shipments from rabl to AMS and adapt its spec
2019-09-08 12:15:33 +01:00
