Maikel
462886447a
Merge pull request #13126 from mkllnk/oidc-error
...
Direct people to refresh OIDC connection when needed
2025-02-24 15:45:48 +11:00
Konrad
7cd3c32787
Merge pull request #13164 from rioug/fix-user-controlled-method-execution
...
Fix user controlled method execution
2025-02-21 12:59:40 +01:00
Filipe
9baed8536c
Merge pull request #13121 from rioug/13054-out-of-stock-autoremove
...
Autoremove/update item from the cart if stock changed during checkout
2025-02-20 22:35:40 -06:00
Gaetan Craig-Riou
0ae855047d
Fix User controlled method execution
...
Add white list for the fire endpoint to limit which action can be taken.
Add specs for fire endpoint
2025-02-18 14:42:26 +11:00
Maikel Linke
fbdc6c9bd0
Split growing supplied product builder
2025-02-18 13:08:46 +11:00
Maikel Linke
61b54e922a
Remove impossible error rescue
...
This block got duplicated in a previous PR.
2025-02-18 12:20:01 +11:00
Maikel Linke
ffe4084b7f
Link to OIDC settings from error message
...
The colour of the link is really bad though.
2025-02-18 12:15:13 +11:00
Maikel Linke
bb503e12a3
Direct people to refresh OIDC connection
...
Not the best UX but the easiest next step to implement. Next we should:
* Include link in error message instead of redirecting straight there.
Otherwise users may feel disoriented.
* Provide a custom error message?
2025-02-18 12:14:12 +11:00
Filipe
e7ef5984d5
Merge pull request #13125 from dacook/dfc-product-import-list-12301
...
[DFC Orders] List products to import on screen
2025-02-13 22:34:32 -06:00
David Cook
f6f1a005cb
Add spec
...
Oh, and a transaction block. Because the controller after hooks tried to update the DB which resulted in
PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block
Even for a small rescue statement, it's worth adding a spec. You never know what might not be working!
2025-02-12 16:10:36 +11:00
David Cook
9b935be4d6
Catch error and provide message
2025-02-12 15:29:49 +11:00
Gaetan Craig-Riou
bf72a89853
Clean up left over comment
2025-02-10 14:25:50 +11:00
David Cook
71782de83a
Apply suggestion from code review
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-02-10 10:35:59 +11:00
David Cook
9f7000009d
Only import selected products
2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd
Show list of products to import
...
If there's a matching product in OFN already, a link will appear.
2025-02-06 16:28:15 +11:00
David Cook
c3b23a9fba
Move import to new action
...
Making way for a review step.
2025-02-06 13:50:26 +11:00
Gaetan Craig-Riou
90eecc783d
Fix stripe controller
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
851cccb823
Fix paypal controller
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
08ad2af91a
Make sure Orders::CheckStockService is only instanciated once
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
cdcab7c7c6
Update insufficient stock logic
...
We now check for insufficient stock when loading the checkout details
or before updating the order.
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
c73c2dd8a8
Add basic out of stock modal
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
a7cde069c6
Add Orders::CheckStockService and spec
...
Move sufficient_stock? to Orders::CheckStockService
2025-02-04 15:39:40 +11:00
Hartani Yassir
69f3f9f62d
use format.json in UserRegistrationController#create
2025-02-03 19:02:48 +01:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Konrad
01036e6321
Merge pull request #13087 from mkllnk/stock-location
...
Remove class Spree::StockLocation
2025-01-25 12:41:37 +01:00
David Cook
46c92db415
Merge pull request #13088 from mkllnk/controller-helpers
...
Remove unused helper module
2025-01-24 14:22:46 +11:00
Maikel
c258bee44d
Merge pull request #13065 from mkllnk/dfc-amend-nothing
...
Admin updates can trigger new backorders until the order cycle is closed
2025-01-22 16:32:23 +11:00
Maikel Linke
d49cea5e3d
Use admin flag instead of user role
2025-01-22 14:59:49 +11:00
Maikel Linke
f8f6c80aa9
Remove unused helper module
...
SimpleCov says that it's not used. So let's see about that. If any
included helpers are used, we can bring them back individually.
2025-01-22 13:51:35 +11:00
Maikel Linke
87d20877ad
Remove Shipment#stock_location
2025-01-22 11:20:05 +11:00
Maikel
229ee7028c
Merge pull request #13064 from mkllnk/negative-stock
...
Don't show stock for on-demand inventory items
2025-01-21 11:05:50 +11:00
Filipe
3c1dd10219
Merge pull request #13047 from mkllnk/spree-roles
...
Clarify that our only user role is "admin" and simplify code
2025-01-16 18:06:49 -06:00
Maikel Linke
c9eed4f5b8
Trigger new backorder only when user checks out
...
When an admin creates an order, then AmendBackorderJob is called which
can also trigger a new backorder if needed.
This means that we are not creating backorders via subscriptions any
more. It has never been requested and we can bring that back if needed.
2025-01-15 15:52:57 +11:00
Maikel Linke
a3ec3e74ae
Hide stock level of on-demand inventory items
...
We changed to tracking stock of on-demand items to be able to place
backorders. This is mostly hidden in the app but was still visible on
the inventory page. Now we are hiding that here, too.
2025-01-09 10:06:04 +11:00
Maikel
5f486bd611
Merge pull request #13036 from chahmedejaz/bugfix/13024-dfc-catalog-syncs-for-blank-cart
...
Fix DFC catalog syncs for blank cart
2025-01-08 12:53:19 +11:00
Maikel
1df3a6bb66
Merge pull request #13049 from mkllnk/dfc-wholesale-stock
...
Calculate stock from DFC wholesale variants
2025-01-08 12:32:44 +11:00
Konrad
428eb465c0
Merge pull request #13009 from MrBowmanXD/dev
...
Added the :selected option with the default tax category #12989
2025-01-07 20:04:28 +01:00
Maikel Linke
faad7fa95c
Move wholesale calculation for re-use
2025-01-07 11:03:36 +11:00
Maikel Linke
ddaeff7c53
Use DfcCatalog in offer broker
2025-01-07 11:03:34 +11:00
Maikel Linke
ef08ae49fe
DRY DFC catalog logic for re-use
2025-01-07 10:49:37 +11:00
Maikel Linke
54f83b45c8
Replace has_spree_role? with simpler admin?
...
We have only one role, so let's get rid of the unneeded method.
Now we are in a better place to get rid of Spree::Role and replace it
with a simple boolean.
2024-12-19 09:19:01 +11:00
Maikel Linke
a7140d1f60
Use only admin role, on demand
...
We are now creating the role on demand which removes the need for
seeding it as well.
2024-12-19 09:02:04 +11:00
Maikel Linke
13e008e91e
Calculate wholesale price for imported retail variants
2024-12-12 16:08:45 +11:00
Maikel Linke
e47a57fa3c
DRY with offer broker we'll need anyway
2024-12-12 15:48:42 +11:00
Ahmed Ejaz
b6eca58798
13024: fix dfc catalog sync for blank cart
2024-12-12 04:28:15 +05:00
Maikel Linke
88837b55b9
Amend backorder also when resuming order
2024-12-11 12:40:46 +11:00
Maikel Linke
9c0a15f431
Amend backorders on admin update orders
2024-12-11 12:40:46 +11:00
Maikel Linke
9ca1b48d2e
Move backorder amendment out of order callback
...
Triggering it for each order is inefficient when we cancel them in bulk.
The callback doesn't allow us to optimise this.
2024-12-11 12:40:46 +11:00
Ahmed Ejaz
f3a30f94db
12973: fix error rendering on UI
...
- The caught errors do not get rendered to the UI because of incorrect rendering methods
2024-12-05 16:18:21 -06:00
Maikel
de938f6f10
Merge pull request #12949 from rioug/12859-use-VINE-voucher
...
[City OFN Voucher] A shopper can use a VINE voucher
2024-12-03 14:04:44 +11:00
