luisramos0
4f2bc33ec3
Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed
2019-07-13 20:56:34 +01:00
luisramos0
0f3404ca27
Rename order_syncer.future_and_undated_orders to explicitly include completed orders from current OC: orders_in_order_cycles_not_closed
2019-07-12 22:20:09 +01:00
Kristina Lim
2c279fd02d
Remove line item adjustments if line item deleted
2019-07-13 03:58:01 +10:00
Luis Ramos
b3c378e8c1
Merge pull request #4029 from Matt-Yorkley/js_render_blocking2
...
Js render blocking 2
2019-07-12 16:34:31 +01:00
Luis Ramos
39475be792
Merge pull request #4030 from Matt-Yorkley/line_item_errors
...
LineItems can always access soft-deleted variants
2019-07-12 16:33:36 +01:00
luisramos0
9e2e460ac5
Add date format to moment date conversion. This conversion was not working on firefox
2019-07-12 12:01:18 +01:00
luisramos0
942824cd74
Improve comments in UserMailer
2019-07-11 16:37:30 +01:00
Matt-Yorkley
b2c6e6271c
LineItems can always access soft-deleted variants
2019-07-11 11:33:34 +01:00
Luis Ramos
cdd36eeefc
Merge pull request #3674 from Matt-Yorkley/spree2/import_description
...
Allow import to proceed when updating a product and `description` is set
2019-07-10 21:09:30 +01:00
Matt-Yorkley
97148f6f57
Send embedded Stripe javascript to :injection_data
2019-07-10 19:28:20 +01:00
Matt-Yorkley
6219b3f0c3
Revert "Revert "Fix JS render-blocking in Darkswarm""
...
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Maikel
ffeca41ef4
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 10:24:25 +10:00
Luis Ramos
23b6267e30
Merge pull request #3916 from luisramos0/schedules_of_coordinator
...
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
Luis Ramos
6872ccfb72
Merge pull request #3963 from luisramos0/hide_invoices
...
Hide invoices feature
2019-07-09 14:20:50 +01:00
Luis Ramos
83ce2ac3dc
Merge pull request #3988 from Matt-Yorkley/js_render_blocking
...
Fix JS render-blocking in Darkswarm
2019-07-09 12:30:30 +01:00
Jon Leighton
4398ea12b8
Convert several fields from string to text
...
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955
Fixes #3192 .
I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
Luis Ramos
8a700307d2
Merge pull request #3992 from Matt-Yorkley/cart_button_bug
...
Fix display bug in cart button on mobile menu
2019-07-08 18:33:36 +01:00
luisramos0
86accc227e
Convert erb files brought from spree_auth_devise to haml
2019-07-08 18:09:03 +01:00
Luis Ramos
1756ddd0e9
Merge pull request #3989 from Matt-Yorkley/preload_primary_font
...
Preload primary font to speed up page rendering
2019-07-08 17:43:15 +01:00
Luis Ramos
fe71781d70
Merge pull request #3791 from jazzdragon/1766-registration-scroll
...
1766 registration scroll
2019-07-08 15:10:35 +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
luisramos0
88312b8e4a
Make OrdersHelper.invoice_links simpler
2019-07-05 11:08:51 +01:00
luisramos0
9be3ff90f7
Make OrdersHelper.complete_order_links simpler
2019-07-05 11:06:49 +01:00
luisramos0
e66dea7e03
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
2019-07-05 10:37:27 +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
