Filipe
93ac10bb75
Merge pull request #13262 from cillian/remove-angular-on-enterprise-images-and-white-label-sections
...
Remove Angular from the Settings > Images section
2025-05-16 20:03:55 +01:00
Konrad
c657e31d07
Merge pull request #13318 from dacook/fix-13315
...
Prevent error on inventory page when logged out
2025-05-16 20:23:17 +02:00
Filipe
3efa2832de
Merge pull request #13257 from ashishp91/13221-make-shipped-orders-uneditable
...
13221 - Don't allow shipped orders to be editable
2025-05-15 19:23:33 +01:00
Filipe
371d0fbf79
Merge pull request #13281 from rioug/13172-search-by-tags
...
[Variant tags] Search products by tags
2025-05-14 07:38:59 +01:00
David Cook
82f94e3969
Ensure user is loaded before loading data
2025-05-13 15:12:16 +10:00
Ashish Gaur
71949701ac
Merge branch 'master' into 13221-make-shipped-orders-uneditable
2025-05-08 21:56:46 +05:30
cyrillefr
55ad9429db
Fixes variable number naming offenses in spree module
2025-05-08 09:24:28 +02:00
Maikel
bc3f847a9d
Merge pull request #13299 from cyrillefr/FixRubocopNamingMethodParameterName
...
Fixes NamingMethodParameterName rubocop offense
2025-05-08 10:34:50 +10:00
Ashish Gaur
5fc3fe03ee
13221 Add spec for checking flash error is shown when editing a shipped order
2025-05-05 20:37:59 +05:30
Ashish Gaur
8d96411741
13221 Fix rubocop issues
2025-05-05 20:03:47 +05:30
Ashish Gaur
c533111509
13221 Don't allow shipped orders to process update request
2025-05-05 20:03:47 +05:30
cyrillefr
f6df412355
Fixes NamingMethodParameterName rubocop offense
2025-05-05 10:39:15 +02:00
Gaetan Craig-Riou
0ca3dca675
Per review, extract tags options from template
...
Now it also scope the tags to the available variant, ie the logged in
user will only see only tag that was used by them.
2025-05-05 14:56:50 +10:00
Gaetan Craig-Riou
e7aae5a03c
Add tag search
...
First minimal implementation with a basic filter UI. Only support search
by any of the selected tags
2025-05-05 14:54:55 +10:00
David Cook
0225db6840
Refactor without setter methods
...
This class was originally built to flexibly accept paramters in any order. It also allowed you to specify multiple of the same type of parameter, with the later one overriding the earlier.
This is too flexible and likely to cause mistakes. And besides, we don't use that feature!
2025-05-05 12:59:27 +10:00
Cillian O'Ruanaidh
65efd3b66c
Render confirm remove image modal outside of form so a simple :button_to can be used instead of submitting via Stimulus controller.
2025-05-02 13:07:31 +01:00
Cillian O'Ruanaidh
a9a4156251
Remove Angular and Stimulus Reflex from the Settings > Images section
2025-05-02 13:07:31 +01:00
Carlos Chitty
d0c687650e
Autocorrect Style/HashEachMethods offenses
2025-04-29 15:16:34 -04:00
Carlos Chitty
63168086e7
Autocorrect Style/HashConversion offenses
2025-04-29 14:27:31 -04:00
piyush828-design
0bb6860343
Merge branch 'master' into pagy_upgrade
2025-04-28 11:23:44 +05:30
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
cyrillefr
7812d5f58a
Replace set_methods in order model
2025-04-24 09:29:40 +02:00
David Cook
e1c6709472
Merge pull request #13251 from cyrillefr/FixRailsLexicallyScopedActionFilterPartI
...
Adresses Rails/LexicallyScoped offenses
2025-04-22 11:26:11 +10:00
Filipe
d2fa2e612c
Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders
...
Allow producer to edit their products on hubs' orders
2025-04-21 11:28:36 +01:00
Filipe
3236cbb0b8
Merge pull request #13191 from mkllnk/dfc-reset
...
Reset stock for absent products in DFC catalog
2025-04-20 21:34:49 +01:00
piyush828-design
3202d0ea81
fixed test failure
2025-04-16 18:24:32 +05:30
piyush828-design
da5cef26db
upgraded pagy to latest version
2025-04-16 17:46:31 +05:30
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
cyrillefr
5c3db6cab8
Removes unused action from filter in controller
2025-04-08 14:04:37 +02: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
Maikel Linke
9e3ff412f9
Simplify controller
2025-03-27 13:36:48 +11:00
Maikel Linke
48e3b5b05e
Move more reset variant code for re-use
2025-03-27 13:36:48 +11:00
Maikel Linke
c43bd0c24b
Move variant reset code to shared service
2025-03-27 13:36:48 +11:00
Maikel Linke
e35a29cc29
Remember local stock of backordered products
...
When retail variants are mapped to wholesale variants, we usually have a
some leftover stock at the end of an order cycle. For example, we
backordered a slab of 12 cans of tomatoes but our customers bought only
9 of those. Then we have 3 left for the next order cycle.
Even when the product is not available for backorder with the supplier,
we still want to sell off our leftover stock, the three cans of tomatoes
in our example.
And it might be that the product will come back in the future.
2025-03-27 13:36:48 +11:00
Maikel Linke
2a81d26ef1
Simplify complex method
2025-03-27 13:36:48 +11:00
Maikel Linke
c60718feea
List absent products in import preview
2025-03-27 13:36:48 +11:00
Maikel
a2e68e1f3c
Explain stock reset further
...
Co-authored-by: David Cook <david@redcliffs.net >
2025-03-27 13:36:48 +11:00
Maikel Linke
a6c08fe2ad
Reset stock for absent products in DFC catalog
2025-03-27 13:36:47 +11: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
