Ahmed Ejaz
213209b460
hide customer info on bulk orders page
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
d9308799b0
add ability search supplier products in orders
2025-04-13 21:35:55 +05:00
Trésor Bireke
5e7f0f8a1a
Merge branch 'master' into tb-rescue-not-found-error-for-enterprise
2025-04-01 01:10:17 +02:00
Tresor11
507705a4eb
Update method name to require
...
This commit updates the method name to be called required_enterprise
since we only expect it to raise an error when the enterprise is not found.
2025-03-31 22:28:38 +03:00
Carlos Chitty
7f734cf2f8
Autocorrect Style/PreferredHashMethods rubocop offense
2025-03-26 11:16:24 -04:00
Tresor11
5b3bae85ca
Rescue Not Found Error for Enterprise for admin
...
Currently when an admin tries to edit an no-existing enterprise, a
NoMethodError is raised.
This commit adds a set_enterprise setter method to the
enterprises controller that sets the @enterprise instance variable to
have the same value as the enterprise object defined in the the edit
method; this method also rescues the NotFound error in case
the enterprise is not found and redirects the user to the enterprises
index page with a error message.
2025-03-22 00:35:27 +03:00
Filipe
3c801a2656
Merge pull request #13182 from mkllnk/invalid-dfc-catalog-url
...
Rescue from invalid DFC catalog URLs
2025-03-18 10:57:26 +00:00
Ahmed Ejaz
37de45b60e
Merge pull request #13189 from chahmedejaz/bugfix/13019-page-redirect-from-shopfront
...
Page is redirected to root after login from shopfront page
2025-03-09 06:14:44 +05:00
David Cook
d3b7db0082
Merge pull request #13186 from cyrillefr/FixRubocopLintIssuesII
...
Fixes some rubocop linting offenses - part II
2025-03-06 11:33:56 +11:00
David Cook
45eedd1e89
Simplify expresssion
...
It's worth noting that a falsy value won't get cached (as before).
But I didn't take the time to investigate if that makes a difference or not.
2025-03-06 10:14:24 +11:00
Ahmed Ejaz
b61c9500f9
13019: fix redirect issue
2025-03-05 01:35:46 +05:00
David Cook
9adf3a22af
Show only first 25 enterprises
...
I thought about reducing it further, but maybe people are used to having a large list. Let's see how this performs
2025-03-03 14:46:24 +01:00
cyrillefr
446b948889
Fixes some rubocop linting offenses - part II
2025-03-03 14:03:47 +01:00
Maikel Linke
f9322ac71b
Style: simplify controller method
2025-03-03 12:23:58 +11:00
Maikel Linke
7f8581fd9f
DRY controller methods which became too long
2025-03-03 12:23:58 +11:00
Maikel Linke
9d5ce0ede5
Remove surrounding whitespace from pasted DFC URL
2025-03-03 12:23:58 +11:00
Maikel Linke
b6153fc155
Rescue from invalid DFC catalog URLs
...
This mistake should be dealt with differently but I wanted to make sure
that a really invalid URL is handled well, too.
2025-03-03 12:23:58 +11:00
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
