luisramos0
1681e8a572
Remove unused auth config
2019-07-08 14:06:01 +01:00
luisramos0
e897eb0439
Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers
...
We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route
2019-07-08 13:59:26 +01:00
luisramos0
0101dcdd93
Remove unused Spree::Dash from controllers brought from spree_auth_devise
2019-07-08 13:10:52 +01:00
luisramos0
9416f61fb3
Remove spree/checkout_controller.completion_route only used in spree/checkout_controller.update which is never used in OFN. Checkout update happpens in the checkout_controller.update
2019-07-08 13:04:38 +01:00
luisramos0
8efd69c3d1
Remove unnecessary checkout registration code, it's not used in OFN
2019-07-08 12:57:17 +01:00
luisramos0
dcbdfbb081
Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets
2019-07-08 11:22:56 +01:00
luisramos0
92968c5efe
Merge spree/users_sessions_controller into spree/users_sessions from spree_auth_devise
2019-07-07 22:06:18 +01:00
luisramos0
c8ac64566f
Merge spree/users_controller_decorator into spree/user_controller
2019-07-07 22:04:04 +01:00
luisramos0
17448699f9
Bring devise initializer from spree_auth_devise and fix spree initializer details
2019-07-05 22:45:59 +01:00
luisramos0
a413f22e12
Remove unnecessary dependency to spree/users helper
2019-07-05 22:37:07 +01:00
luisramos0
fc0ffda8ec
Bring routes and controllers from spree_auth_devise
2019-07-05 15:08:42 +01:00
Luis Ramos
00841cb537
Merge pull request #3923 from luisramos0/prod_image_error
...
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
Luis Ramos
57917a498b
Merge pull request #3946 from luisramos0/missing_translatiojns
...
Fix last missing translations covered by specs
2019-06-24 20:52:59 +01:00
Maikel
71f396a44f
Merge pull request #3896 from luisramos0/clear_unit_desc
...
Clear product.variants.unit_description if product.variant_unit is items
2019-06-21 15:00:06 +10:00
Maikel
5aea361d87
Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
...
Start upgrade to Rails 4
2019-06-21 14:58:24 +10:00
luisramos0
eab6cc563b
Fix rubocop issues
2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
luisramos0
40f7d07e27
Remove unnecessary method from spree storecontroller and spree orderscontroller
2019-06-18 10:47:34 +01:00
luisramos0
c56486d7ae
Remove unnecessary methods from spree checkoutcontroller
2019-06-18 10:47:34 +01:00
luisramos0
56db90f49e
Remove unused checkout controller update action and order controller populate action
...
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
2019-06-18 10:47:34 +01:00
luisramos0
a8b4037885
Remove dependency to coupon code logic in checkoutcontroller, ofn doesnt have that feature
2019-06-18 10:47:34 +01:00
luisramos0
fc145d472d
Add home controller to ofn codebase from spree frontend
2019-06-18 10:47:34 +01:00
luisramos0
5037cce6f5
Add all the code missing from checkout, order and store controllers to ofn controllers
2019-06-18 10:47:34 +01:00
luisramos0
c399491314
Move spree frontend routes to ofn and transform decorators with class_eval to controller classes
2019-06-18 10:47:34 +01:00
luisramos0
0cdb49818d
Remove distinct from enterprise.ready_for_checkout scope
...
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
2019-06-18 10:40:49 +01:00
luisramos0
0235a04530
Add missing translation key in user sessins controller
2019-06-17 15:48:52 +01:00
luisramos0
a7c970054c
Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails
2019-06-14 10:20:28 +01:00
luisramos0
1a4e83d633
Change products controller to clear variants unit description if variant_unit is items
2019-06-01 16:56:17 +01:00
luisramos0
07854cf372
Fix a few problems introduced by rubocop auto correct
2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Luis Ramos
9ccf502365
Merge pull request #3797 from lin-d-hop/variant-master-price
...
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
lin-d-hop
7b87e609c4
Set master variant price in products controller
...
Set master variant price in products controller
Code climate tidy up
Syntax improvement
Revert "Remove non-functional Price field from Edit Product screen"
This reverts commit 585072302c585072302c
2019-05-06 14:20:01 +01:00
Kristina Lim
f14e7e97b1
Do not check need to warn of invalid OCs unless request is HTML
2019-05-06 15:41:29 +08:00
luisramos0
fce3d69345
Add flash and warning to the cart page when item becomes unavailable
2019-04-13 21:39:41 +01:00
Luis Ramos
4bf9320be8
Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees
...
Close adjustments so that updates are effective
2019-04-10 21:58:22 +01:00
Luis Ramos
4478d51aee
Merge pull request #3668 from luisramos0/2-0-stable-Mar29
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
luisramos0
bc8bca074c
Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4
...
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
2019-03-29 22:16:39 +00:00
luisramos0
527cfc1601
Merge branch 'master' into 2-0-stable-Mar29
2019-03-29 13:48:49 +00:00
Maikel Linke
fabca84001
Close adjustments so that updates are effective
...
Spree 2.0 keeps shipping fee adjustments open unless they are manually
closed. But open adjustments cannot be edited.
To preserve updates, like changing the amount of the shipping fee
we close the adjustment first.
2019-03-29 17:23:15 +11:00
luisramos0
010007a2c7
Merge branch '2-0-stable' into 2-0-stable-Mar22
2019-03-26 09:07:48 +00:00
Luis Ramos
9a771ecbb8
Merge pull request #3613 from luisramos0/2-0-update-variants-stock
...
[Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages
2019-03-26 08:55:34 +00:00
luisramos0
a8c0eef3d3
Improve admin variants controller create action, it doesn't try to set on_hand and on_demand if there are previous errors in the variant
2019-03-22 23:23:10 +00:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
Pau Perez
96b8c8ac2c
Refresh products cache also on Variant#delete
...
Note that, as explained in
https://apidock.com/rails/v3.2.13/ActiveRecord/Relation/delete , `delete` does
not trigger callbacks and so it skips the products cache logic.
If we still want to avoid instantiating the AR object, we need to explicitly
call that logic for the cache to be up-to-date.
2019-03-22 09:57:15 +01:00
Pau Perez
fbc3fc6a51
Test spree/admin/variants_controller #destroy
2019-03-22 09:18:31 +01:00
Kristina Lim
94606025c9
Separate call and call! for AdvanceOrderService
2019-03-21 20:34:51 +08:00
luisramos0
21a10d0206
Add on_hand and on_demand back to variants form (both variant create and edit pagei), this is where they used to be in spree v1
...
The admin variants controller create action is adapted (same as in the admin ProductsController). This is necessary because variant.on_hand and on_demand cannot be mass assigned on creation in v2, see VariantStock for more details.
For now we are hiding the new stock management page that comes in spree v2 as we don't need the complexity added by the management of stock per stock location (only one stock location in ofn v2 for now)
2019-03-18 19:02:48 +00:00
luisramos0
b62e350fab
Improve reports controller decorator by removing some copy pasted code and deleting some code repeated across data_load and the main action methods
2019-03-13 12:24:40 +00:00
luisramos0
05d42d475e
Make reports and subscriptions specs work without product.distributors attribute
2019-03-13 12:24:40 +00:00
luisramos0
ed9321e92d
Remove product distributions from product model and controller
2019-03-13 11:47:50 +00:00
