luisramos0
942824cd74
Improve comments in UserMailer
2019-07-11 16:37:30 +01:00
luisramos0
86accc227e
Convert erb files brought from spree_auth_devise to haml
2019-07-08 18:09:03 +01:00
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
10e123a9c4
Move spree/authentication_helpers injection from spree initializers directly to the application_controller
...
Also, switch from using send to public_send making rubocop happier
2019-07-08 13:11:57 +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
05a72be273
Move handle_asynchronously :send_reset_password_instructions to after send_reset_password_instructions declaration
...
This was as it was before the merge of user_decorator and user, the declaration was in the original class and the handle_asynchronously part was in the decorator which was loaded after the main user class from spree_auth_devise, this commit restores the order and fixes a spec in authentication_spec
2019-07-07 17:53:12 +01:00
luisramos0
f557996817
Add deface overrides from spree_auth_devise for the users menu tab, the admin top bar and the shared login bar (maybe dead code this last one)
2019-07-06 22:53:20 +01:00
luisramos0
1a64a737d4
Add ActionController::Metal frorm spree_auth_devise for api authentication
2019-07-06 10:50:48 +01:00
luisramos0
7c0087cb30
Remove reference to empty spree_auth css and js files from spree_auth_devise
2019-07-06 00:02:40 +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
893952f46b
Merge user_mailer_decorator into user_mailer
2019-07-05 22:31:06 +01:00
luisramos0
061e3cd722
Add user mailer from spree_auth_devise
2019-07-05 22:29:51 +01:00
luisramos0
a83790951d
Add model auth_config from spree_auth_devise
2019-07-05 21:58:29 +01:00
luisramos0
4e33529845
Merge user_decorator.rb into user.rb
2019-07-05 21:58:28 +01:00
luisramos0
a2a8b330b7
Add User class from spree_auth_devise as is
2019-07-05 21:58:28 +01:00
luisramos0
9669016573
Add required views from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
2755cb9ec7
Add users_tab partial from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
fc0ffda8ec
Bring routes and controllers from spree_auth_devise
2019-07-05 15:08:42 +01:00
Luis Ramos
397729ed3d
Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
...
Display enterprise ID in profile
2019-07-05 11:14:43 +01:00
François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
François Turbelin
5ce2af454e
Clean id field
2019-07-03 23:00:36 +02:00
Luis Ramos
951787d456
Merge pull request #3987 from mkllnk/3978-optimise-products-cache
...
3978 Optimise products cache
2019-07-03 19:59:07 +01:00
Luis Ramos
b35743b6e4
Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
...
Rescue checkout on shipping id conflict
2019-07-03 19:56:24 +01:00
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
Kristina Lim
3e37c8a3f1
Change underscores in CSS classes to hyphens
...
These were triggering a warning from scss-lint.
2019-07-03 04:43:35 +08:00
Kristina Lim
691d7d735b
Reduce padding between top bar menu items
2019-07-03 04:35:44 +08:00
Kristina Lim
6d1dd76590
Cap width of hub name in top bar and wrap
2019-07-03 04:30:06 +08:00
Kristina Lim
653067f58c
Omit text for top bar items with icon in large
...
This affects only top bar menu items for:
* Language
* Profile
This does not update the "Log in" menu item, because the currently
selected icon might not be self explanatory.
2019-07-03 01:49:36 +08:00
Kristina Lim
06ed9c838e
Remove extra left padding from top bar menu items
2019-07-03 01:49:35 +08:00
Maikel Linke
73372a58ef
Remove unused and dangerous Exchange#eql? override
...
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.
I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel Linke
287d6a926a
Document Exchange
2019-07-02 18:42:02 +10:00
Maikel Linke
04b07a1ff5
Further optimise querying affected exchanges
...
The implementation queried the database for each incoming variant that
was changed. This rewrite combines ActiveRecord relations so that it
creates only one query. This saves another 5-10% of execution time when
updating enterprise fees on production instances.
2019-07-02 18:42:01 +10:00
Luis Ramos
5ecab7a0c2
Merge pull request #3971 from Matt-Yorkley/basket_errors
...
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +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
Maikel Linke
980b4a86ab
Move shipment rescue to its own method
2019-06-26 10:48:51 +10:00
Matt-Yorkley
5100ad6b51
Improve #line_items_for logic and add more tests
2019-06-25 15:33:42 +01:00
luisramos0
7e2bead54d
Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity
2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
7bd32d4967
Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
...
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb)
2019-06-25 14:47:47 +01:00
Luis Ramos
9b6f1a5e11
Merge pull request #3958 from Matt-Yorkley/pi_encoding
...
Improve handling of invalid characters in uploaded CSV files
2019-06-25 14:44:32 +01:00
Matt-Yorkley
0a155da273
Avoid undefined method 'order' errors when removing lineitems from basket
2019-06-25 11:13:56 +01:00
