Gaetan Craig-Riou
52bc88bbd8
Merge pull request #11369 from Matt-Yorkley/product-taxon
...
[Product Refactor] Primary Taxon
2024-04-03 10:31:49 +11:00
Ana Nunes da Silva
eedbaaff6e
Fix duplicate branch in Spree::Preferences::Preferable private method
...
:string, :text and :password cases have the same value
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
5fde1cc7cd
Fix duplicate branch in Spree::Preference#value method
...
:string, :text and :password cases have the same value
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
3e796da8ff
Fix duplicate branch Spree::Calculator
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
8bee48df6d
Fix duplicate branch in Enterprise#category method
...
non_producer_sells_any and non_producer_sells_own have the same category
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
eaf32226a4
Fix duplicate branches in Spree::Admin::BaseHelper
...
:string case already handled by the else case
2024-04-02 10:20:17 +01:00
Gaetan Craig-Riou
484c037c38
Fix duplication coming from a rebase error
2024-04-02 10:18:47 +11:00
Gaetan Craig-Riou
100239c4e6
Fix #bulk_product duplicate
...
Remove duplicate when a product has mutiple variant in the same category
(taxon)
2024-04-02 09:59:16 +11:00
Gaetan Craig-Riou
678fa37df9
Fix duplication issue
...
When a product had mutiple variant assigned to the same category it
should only return the product one
2024-04-02 09:57:36 +11:00
Gaetan Craig-Riou
8c05838080
Move the category to the variant row
2024-04-02 09:57:36 +11:00
Matt-Yorkley
a55931c081
Reinstate sorting by arbitrary list of product categories
2024-04-02 09:42:43 +11:00
Matt-Yorkley
2743a8183d
Disable sorting by user-defined product category order
2024-04-02 09:33:34 +11:00
Matt-Yorkley
3f2a5786bd
Apply taxon from sibling variant if none is provided on variant creation
2024-04-02 09:27:37 +11:00
Matt-Yorkley
02abe5cc06
Remove dead code related to multiple product taxons
2024-04-02 09:27:37 +11:00
Matt-Yorkley
fb09a7f1e6
Fix product filtering
2024-04-02 09:27:37 +11:00
Matt-Yorkley
78495d0ace
Drop unnecessary params filtering
2024-04-02 09:27:37 +11:00
Matt-Yorkley
6025491f94
Update product serializer
2024-04-02 09:27:37 +11:00
Matt-Yorkley
c5ec7e361b
Update product import
2024-04-02 09:27:36 +11:00
Matt-Yorkley
d4dd3cc708
Update products v3 table
2024-04-02 09:27:36 +11:00
Matt-Yorkley
6b3e33f607
Update Taxon associations and joins
2024-04-02 09:27:36 +11:00
Matt-Yorkley
3b715875ad
Update taxon association
2024-04-02 09:27:36 +11:00
Matt-Yorkley
65731f6c52
Update serializers and views for admin products index
2024-04-02 09:27:36 +11:00
Matt-Yorkley
2707c3137a
Apply taxon to new variant when creating a new product
2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d
Update admin forms
2024-04-02 09:27:36 +11:00
Matt-Yorkley
2ef266390d
Move primary taxon to variant
2024-04-02 09:27:36 +11:00
David Cook
b9b2c876cc
Ensure value always shows
...
Even thought it's not valid (you can't save items with an empty name), it's disconcerting when the value suddenly disappears from view.
2024-03-27 20:20:20 +11:00
David Cook
99121943a7
Fix bug
...
I missed a bit in a refactor, and it wasn't covered by the spec.
2024-03-27 20:20:20 +11:00
David Cook
b2881bb169
Add JS specs
...
Converted using https://www.codeconvert.ai/coffeescript-to-javascript-converter
With plenty of manual fixes required too..
2024-03-27 20:20:20 +11:00
David Cook
924701e161
Load available units from system config
...
I'm not sure what's the best way to load data into javascript.. this works.
2024-03-27 20:20:20 +11:00
David Cook
1d8ed67b0b
Handle unit scale changes
...
As discussed, this is the desired behaviour. The current screen appears to do this, but fails to save the changes.
2024-03-27 20:20:20 +11:00
David Cook
d238fc0cad
TODO: optimise and fix bug
2024-03-27 20:20:20 +11:00
David Cook
4ddb2ff1e9
Generate unit display with OptionValueNamer
2024-03-27 20:20:20 +11:00
David Cook
cf31d09ad8
Prevent submitting empty value
2024-03-27 20:20:20 +11:00
David Cook
49226ffdbc
Extract unit_value and unit_description values
...
Copied from display_as.js.coffee (ofn.admin.ofnDisplayAs.variantUnitProperties).
2024-03-27 20:20:20 +11:00
David Cook
c98956bf5a
Add variant controller
...
This will manage the various unit fields. Maybe it should have a more specific name.
2024-03-27 20:20:16 +11:00
David Cook
9beaf0a0c2
Use textContent FTW
...
Oh look, the test works better now too.
2024-03-27 17:35:09 +11:00
David Cook
6291cce5d1
Fix style for empty popout button
...
There's still an odd 1px height change on hover that I can't track down. I think it would be better to just give new variants a default of 1 (blank is not valid anyway).
2024-03-27 17:35:09 +11:00
David Cook
e589605e3c
Rename popout style classes
2024-03-27 17:35:08 +11:00
David Cook
e110cd1145
Fix popout to focus first _visible_ field
2024-03-27 14:34:31 +11:00
David Cook
26723194d5
Prevent popout from updating display value
...
Watch out, HAML will strip an attribute with boolean false, so we need to use a string. Or reconsider using false as a default value..
I wish Jest had the rspec concept of `let`.
2024-03-27 14:34:31 +11:00
David Cook
e94fddb0f8
Style label in popout
...
And tweaked global style as per design.
And cleanup unused classes.
2024-03-27 14:34:31 +11:00
David Cook
4f7d50ca4b
Refactor CSS to reduce scope
...
We don't want the fields inside the popout to be naked, so need to be more specific.
2024-03-27 14:34:31 +11:00
David Cook
f13f2cfa2f
Move values to variables
...
I didn't end up using these, but it's probably worth keeping for consistency.
2024-03-27 14:34:31 +11:00
David Cook
4a776233db
Move fields into a popout
2024-03-27 14:34:31 +11:00
David Cook
436f733213
Add variant unit fields
...
Unfortunately we can't use an input[type=number] because you're allowed to type text for unit_description.
These fields will be conditionally shown/hidden in upcoming steps.
2024-03-27 14:34:31 +11:00
David Cook
a5741a1ca8
Sync hidden variant unit fields
...
This will be necessary for managing the 'display as' state.
..or is it?
2024-03-27 14:34:19 +11:00
David Cook
45b4e6c87c
Add comments
...
To save me or someone else having to figure it out again.
2024-03-27 14:33:32 +11:00
Matt-Yorkley
c01bab5f27
Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads
...
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
2024-03-26 13:39:16 +00:00
David Cook
6240f37adf
Merge pull request #12308 from dacook/update-rails-nested-form
...
chore(deps): update rails-nested-form from fork to v5.0.0
2024-03-26 13:26:50 +11:00
David Cook
52a36f33bc
Merge pull request #12298 from mkllnk/devise-links
...
Remove unused Devise login links partial
2024-03-25 12:57:39 +11:00
