Filipe
c3e4c53a01
Merge pull request #10074 from binarygit/order-cycle-closes-during-split-co
...
Redirect to shopfront when Order cycle closes during split checkout
2022-12-22 15:09:57 +00:00
Filipe
6f3d27b99b
Merge pull request #10089 from abdellani/fix-payment-non-3d-need-to-be-manually-captured-in-BO
...
Fix Payments with non-3D cards need to be manually captured in the BO (Split checkout)
2022-12-20 10:09:45 +00:00
Rachel Arnould
fd95970774
Merge pull request #8996 from jibees/introduce-backoffice-ui-uplift
...
Introduce backoffice UI uplift
2022-12-14 14:20:43 +01:00
Mohamed ABDELLANI
84aedaa1a1
run process_payments before order confirmation
2022-12-08 11:13:54 +01:00
Filipe
996d3afe4f
Merge pull request #9983 from cillian/remove-exchange-tags-n1-query
...
Remove N+1 query loading tags for each order cycle exchange
2022-12-07 17:38:41 +00:00
Jean-Baptiste Bellet
d7d29e3654
Create a new controller for new products page
...
Controller is constrained by FeatureToggle
- new_products_page
- and available on '/new_products'
Add simple view for new products page and a product
Add new products page as a new entry in the menu
2022-12-07 15:08:52 +01:00
binarygit
764c8d7d27
Redirect to shopfront when OC closes during split checkout
2022-12-01 15:13:36 +05:45
Mohamed ABDELLANI
e25f4b1daa
integrate ReportRenderingOptions in the View/Controller
2022-11-25 09:10:53 +01:00
Cillian O'Ruanaidh
fbe6dcba7a
Remove N+1 query loading tags for each order cycle exchange
2022-11-11 17:01:46 +00:00
Rachel Arnould
2652bc086a
Merge pull request #9755 from cillian/order-cycle-payment-methods
...
Let people choose which payment methods are available to customers on order cycles
2022-10-26 20:10:34 +02:00
Konrad
e8425c5805
Merge pull request #9792 from vsmay98/6531-remove-user-registrations-controller
...
Remove spree user registrations controller file
2022-10-25 11:52:34 +02:00
Konrad
4a7ac45dba
Merge pull request #9830 from jibees/9821-remove-report_inverse_columns_logic-feature-toggle
...
Remove `report_inverse_columns_logic` feature toggle
2022-10-25 00:23:31 +02:00
Konrad
84bf38ce4d
Merge pull request #9791 from vsmay98/8250-fix-snail-for-all-enterprise-fee
...
Fix snail issue for all enterprise fees
2022-10-24 21:49:45 +02:00
Rachel Arnould
3c9b7a10f4
Merge pull request #9058 from Matt-Yorkley/oidc-redux
...
Add OIDC authentication for Les Communs
2022-10-24 13:18:36 +02:00
Jean-Baptiste Bellet
e2441cdcf6
Use the report type or subtype as the title
2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
edc667a336
By default, some columns are hidden.
2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
02787e668f
Remove report_inverse_columns_logic feature toggle
...
Co-Authored-By: Maikel <maikel@email.org.au >
2022-10-24 11:12:22 +02:00
Maikel
627b8af37b
Merge pull request #9828 from mkllnk/authorize-api-key
...
Prevent users from changing API keys for others
2022-10-24 11:22:35 +11:00
Cillian O'Ruanaidh
7458dccea6
Call @order_cycles.count instead of #size because TagRuleApplicator doesn't return Relation anymore
...
In March 2020 this was changed to use :size instead of :count because TagRuleApplicator returned an ActiveRecord::Relation, see:
d2eee1dafd7e606471e4
2022-10-21 17:21:31 +01:00
jibees
48e18b016a
Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee
...
Fix snail issue for all shipping method fees
2022-10-20 17:31:24 +02:00
Vishal Jain
8d3845508c
remove check_permissions method
2022-10-20 19:54:23 +05:30
Vishal Jain
952b6039f9
Remove spree user registrations controller file
2022-10-20 19:54:23 +05:30
Maikel Linke
fc79612f26
Prevent users from changing API keys for others
...
It was checking for the permission to create a user which everyone can
do. Now it's checking for updating that particular user and doesn't
allow generating new keys for other users any more.
This would have been an inconvenience but not a big security issue
because you can't view the key of another user.
2022-10-20 17:56:46 +11:00
Vishal Jain
755107ec9f
Fix snail issue for all enterprise fees
2022-10-20 12:15:21 +05:30
Matt-Yorkley
0ca86344d2
Update use of deprecated #add_tab method to #add_metadata
2022-10-19 17:36:53 +11:00
Matt-Yorkley
980f004b83
Update Bugsnag error data
2022-10-19 17:36:52 +11:00
Matt-Yorkley
617164684c
Configure OIDC
2022-10-18 11:32:14 +11:00
Vishal Jain
e02de2b17d
Fix snail issue for all shipping method fees
2022-10-11 15:30:19 +05:30
Maikel Linke
52e934ec2b
Consistently use our FeatureToggle module
...
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
2022-10-08 16:23:17 +02:00
Rachel Arnould
611475c48a
Merge pull request #9448 from binarygit/cancel-orders-in-bulk
...
Cancel Orders in Bulk
2022-10-04 19:48:59 +02:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
binarygit
930721bea6
Redirect to shop front when OC closes during checkout
2022-10-03 20:51:41 +02:00
Cillian O'Ruanaidh
747c88fb35
Update the Shop::OrderCyclesList service so it's clearer what kind of order cycles are being fetched
...
Before the Shop::OrderCyclesList service would return order cycles even if they are not ready for checkout and we had a check before calling the service in BaseController which would return OrderCycle.where('false'). It seems like this check should be part of the service too.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
f4a4f7c9ff
Remove validations checking order cycle has shipping methods
...
Instead we will make sure the order cycle is not available on the shopfront if it is doesn't have valid shipping methods. This will preven the issue where if one distributor deletes their shipping method, we don't want to invalidate the order cycle for all other distributors.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a46b77d10c
Ensure hack for showing products on a shop with closed order cycles also works if an order cycle has no shipping methods
...
If a distributor order cycle has no shipping methods it will be invalid. This is a bit confusing because adding a check for :invalid seems like it would be better if it was done in the Shop::OrderCyclesList service but the hack doesn't work if you put it in there, it seems like something needs a refactor.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
855ec1a708
Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods
2022-09-30 13:13:39 +01:00
Maikel Linke
d81037d658
Simplify branching logic in SearchesController
2022-09-29 09:30:21 +02:00
Maikel Linke
12d7db3dd6
More efficient enterprise access check
2022-09-29 09:30:21 +02:00
Jean-Baptiste Bellet
cdf71b419f
Search within all enterprises if user is the super admin
2022-09-29 09:30:21 +02:00
Jean-Baptiste Bellet
86cb86e8b5
Add a flash error where no available shipping methods to the customer
...
+ update specs as well
2022-09-12 09:42:26 +02:00
Maikel
f201b9fd11
Merge pull request #9631 from mkllnk/9153-tax-recalculation
...
[Split Checkout] Recalculate tax on summary step
2022-09-08 11:39:44 +10:00
Maikel Linke
1d04510365
Update totals on summary step
2022-09-05 15:54:33 +10:00
Maikel Linke
6c7a089527
Recalculate tax on summary step
2022-09-05 15:14:08 +10:00
binarygit
8861b6d077
Replace permalinks angular ctrl with stimulus
2022-08-31 10:06:51 +05:45
Filipe
ae391f8af4
Merge pull request #9414 from Philwi/user-generates-api-key
...
Let users view and regenerates api key
2022-08-17 21:36:13 +01:00
Filipe
f28c52342c
Merge pull request #9532 from jibees/9492-translate-404,-500,-422-errors-pages
...
Translate 404, 500, 422 errors pages
2022-08-17 21:12:04 +01:00
Filipe
cedfa35a98
Merge pull request #9341 from jibees/9336-redirect-to-login_path-if-user-is-disabled
...
Disabled_at logic: redirect to login path if user is disabled
2022-08-17 20:33:57 +01:00
Filipe
b992daa1d8
Merge pull request #9510 from binarygit/convert-enterprises/edit-page-to-stimulus
...
Convert enterprises/edit page to stimulus
2022-08-17 18:11:59 +01:00
Filipe
10aa534f52
Merge pull request #9554 from apricot12/9179-Note-on-invoices
...
Add order note at the end of both invoices following current UI patterns.
2022-08-17 17:41:23 +01:00
Jean-Baptiste Bellet
77eec6e6f3
Check step params and redirect if step is inconsistent to order state
2022-08-15 16:13:37 +10:00
