Luis Ramos
|
d7223c508a
|
Merge pull request #4289 from luisramos0/spree_be_config_general
Move general_settings, mail_methods and image_settings from spree_backend to OFN
|
2019-10-16 12:08:36 +01:00 |
|
luisramos0
|
6bc0d505e4
|
Fix some rubocop issues
|
2019-10-16 10:40:16 +01:00 |
|
luisramos0
|
9a0f1adfd2
|
Reorganize/simplify before filters
|
2019-10-16 10:40:09 +01:00 |
|
luisramos0
|
0f128f43f9
|
Merge images controller decorator with the controller brought from spree_backend
|
2019-10-15 00:02:16 +01:00 |
|
luisramos0
|
ea9f3ad6a0
|
Bring images controller from spree_backend so we can merge it with ofn's decorator
|
2019-10-15 00:00:54 +01:00 |
|
luisramos0
|
1c257cca3f
|
Merge payment methods controller brought from spree_backend with its decorator that was in OFN
|
2019-10-14 23:14:09 +01:00 |
|
luisramos0
|
c51e4d657a
|
Bring payment method controller from spree_backend
|
2019-10-14 23:09:23 +01:00 |
|
Luis Ramos
|
35d76ac991
|
Merge pull request #4298 from luisramos0/variant_edit
Make unit description visible in the variant edit page even for products which variant_unit is items
|
2019-10-13 19:54:41 +01:00 |
|
Matt-Yorkley
|
da7456e6e0
|
Remove old shop/products route, action, and spec
|
2019-10-09 17:27:00 +01:00 |
|
Dan Ingenthron
|
bdcadf9fc6
|
Update changes to reflect new non-Spree shipping method controller
|
2019-10-08 18:37:16 -05:00 |
|
Dan Ingenthron
|
9b7139fd45
|
Add default shipping category during object creation; revert forms
|
2019-10-08 18:37:16 -05:00 |
|
Matt-Yorkley
|
06e1f56ae9
|
Extract filter list fetching into a separate endpoint
|
2019-10-08 10:11:24 +01:00 |
|
Luis Ramos
|
54c44c33eb
|
Merge pull request #4324 from Matt-Yorkley/reports_memoize
Reports memoization
|
2019-10-07 13:20:03 +01:00 |
|
Matt-Yorkley
|
bc826f73a1
|
Add temporary placeholder for API endpoint
|
2019-10-03 18:11:40 +01:00 |
|
Luis Ramos
|
c15660da0e
|
Merge pull request #4269 from luisramos0/spree_be_config
Move shipping_methods and shipping categories from spree_backend to OFN
|
2019-10-03 13:45:17 +01:00 |
|
luisramos0
|
7f9f0d840c
|
Merge decorators into controllers and remove decorators
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
686840e262
|
Fix basic rubocop issues in recently added controllers from spree_backend
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
2377b833ee
|
Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
3f3c33bce6
|
Fix basic rubocop issues in newly added controller
|
2019-10-02 21:25:23 +01:00 |
|
luisramos0
|
e35eff95bb
|
Add mail_methods controller from spree_backend related to config
|
2019-10-02 21:25:23 +01:00 |
|
Luis Ramos
|
4540b32d3a
|
Merge branch 'master' into spree_be_config_taxons
|
2019-10-02 15:35:15 +01:00 |
|
Luis Ramos
|
14047c620a
|
Merge branch 'master' into spree_be_config_tax
|
2019-10-02 15:31:25 +01:00 |
|
Luis Ramos
|
2be1c231f7
|
Merge pull request #4290 from luisramos0/spree_be_config_zones
Move zones, countries and states from spree_backend to OFN
|
2019-10-02 14:30:59 +01:00 |
|
Matt-Yorkley
|
cc11d4e5f0
|
Remove unused user parameter from OrdersAndFulfillmentsReport
|
2019-10-01 15:59:51 +01:00 |
|
Matt-Yorkley
|
112adb11db
|
Pass permissions object into OrdersAndFulfillMentsReport
|
2019-10-01 15:51:43 +01:00 |
|
Kristina Lim
|
bb56e9a5b9
|
Set default date range for Orders and Fulfillment report
|
2019-09-28 02:39:41 +08:00 |
|
JASON KNOEPFLER
|
c46fe7b675
|
encapsulate new unconfirmed email logic
|
2019-09-25 19:41:33 -07:00 |
|
luisramos0
|
baa09b88f7
|
Fix issue with nil current_order where shipping_method serializer requires a current_order to calculate the shipping fees
|
2019-09-25 09:52:10 +01:00 |
|
luisramos0
|
78cf35807a
|
Improve preloading of order query to avoid N+1 queries
|
2019-09-23 23:50:39 +01:00 |
|
luisramos0
|
24afa21885
|
Revert "Change products controller to clear variants unit description if variant_unit is items"
This reverts commit 1a4e83d633.
|
2019-09-22 16:31:26 +01: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 |
|
luisramos0
|
fc433ff8f0
|
Refactor ship methods controller destroy action: remove single action before_filter
|
2019-09-20 16:29:36 +01:00 |
|
luisramos0
|
8e33437fbb
|
MErge ship method controller decorator with the controller that came from spree
|
2019-09-20 15:59:24 +01:00 |
|
luisramos0
|
a5103c737d
|
Fix rubocop issues in ship methods controller from spree
|
2019-09-20 15:58:05 +01:00 |
|
luisramos0
|
37c8f42244
|
Bring shipping methods and categories controllers from spree_backend
|
2019-09-20 15:56:24 +01:00 |
|
luisramos0
|
0e8765636b
|
Bring tax_settings from spree_backend to ofn
|
2019-09-20 15:46:33 +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
|
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
|
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 |
|
luisramos0
|
25fbab2e37
|
Use memoized order method
|
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 |
|
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 |
|