Filipe
a5d17b4da9
Merge pull request #12459 from mkllnk/description-html
...
Sanitise HTML in long description of enterprise
2024-09-19 16:12:45 -06:00
Filipe
562a24524b
Merge pull request #12848 from rioug/12770-product-preview
...
Product preview
2024-09-19 15:20:18 -06:00
David Cook
296997d558
Test to ensure report abilities
2024-09-17 13:23:14 +10:00
Gaetan Craig-Riou
a25937321a
Remove ability of any admin user to see all product
...
And fix related spec
2024-09-17 11:46:55 +10:00
Maikel Linke
d061fe8ad9
Remove unnecessary sanitising
...
Existing descriptions have been sanitised in a migration. New
descriptions are sanitised when assigned. That should cover everything.
2024-09-05 12:38:33 +10:00
drummer83
7e7ab2e36d
Fix typo in "categeory" (additional e) and update specs
2024-08-23 13:20:46 +02:00
Maikel
7f09044ae1
Merge pull request #12755 from johansenja/optimise-shops-page6
...
Optimise shops page: Enable injected enterprise data to be scoped to specific enterprise ids
2024-08-23 09:26:22 +10:00
Maikel
e9c7e1778c
Merge pull request #12782 from mkllnk/reports
...
Add fallback report loading in case websockets fail
2024-08-23 09:23:42 +10:00
wandji20
de063fecb1
Move same_datetime_value method to OrderCycle model [OFN-12775]
2024-08-22 22:17:12 +01:00
Joseph Johansen
ce6ae04147
Add spec for confirming correct values when scoped
2024-08-22 17:41:00 +02:00
Joseph Johansen
1b8e256e8a
Add unit tests
2024-08-22 17:41:00 +02:00
Maikel
0c7448ba43
Merge pull request #12726 from mkllnk/order-stock-spec
...
Track (negative) stock for on-demand products and overrides
2024-08-20 15:05:16 +10:00
Maikel Linke
19ef047193
Create observable reports blob early
...
This will allow us to check for completion of the report later in case
websockets fail.
2024-08-16 14:37:57 +10:00
wandji20
1e71db9315
Remove permalinmk from taxons [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
a85cfab506
Remove awesome nested set gem and dependencies [OFN-11636]
2024-08-12 18:47:16 +01:00
Maikel Linke
2201d2e8c2
VariantOverride with on_demand now overriding stock
...
Otherwise we would try to take stock from the producer stock level
without respecting their on-demand settings. So from now on:
If stock level or on_demand are set on the override then it's not using
producer stock levels.
2024-08-02 14:40:17 +10:00
Maikel Linke
b6c407971d
Allow on-demand VariantOverride to track stock
...
We allowed this for producer stock and need to do the same for inventory
stock. This will allow us to create backorders for missing, but promised
stock.
2024-08-02 14:40:17 +10:00
Maikel Linke
cd8dc41b15
Update stock specs and add pending cases
2024-08-02 14:40:17 +10:00
Maikel Linke
a1887bdc76
Update stock levels of on-demand items
...
We weren't bothering with stock when items were on demand anyway. But we
want to track stock now so that we can backorder more when local stock
levels become negative.
2024-08-02 14:40:17 +10:00
Maikel Linke
675b7febdf
Test stock logic on variant level
...
VariantOverrides are bolted onto variants to change their logic.
2024-08-02 14:40:17 +10:00
Maikel Linke
90fdf59415
Test current stock logic on shipment level
...
During checkout, stock is adjusted when a shipment is finalised. The
chain is:
* Order state change to complete.
* Trigger Order#finalize! which updates shipments.
* Trigger Shipment#finalize! which adjusts stock on the variant.
* A variant holds stock in stock items or in a variant override.
2024-08-02 14:40:17 +10:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00
David Cook
c5fc621aa4
Use scope to determine which enterprises are ready to be affiliated
2024-07-30 15:21:29 +10:00
David Cook
e9d7a0b099
Add User#affiliate_enterprises
2024-07-25 21:14:01 +10:00
Joseph Johansen
5086f2d8b5
Fix rubocop Style/Send group
2024-07-23 14:18:26 +01:00
Maikel Linke
a37b0eb698
Replace mocking on tested order object
...
It's more realistic this way.
2024-07-11 15:42:23 +10:00
Maikel Linke
2e36c699f6
Test resulting stock instead of method calls
...
The next test case wasn't asserting anything as well. The referenced
method `decrease_stock_for_variant` doesn't actually exist.
2024-07-11 15:42:23 +10:00
Maikel Linke
cb4e7d6fe3
Fix spec to assert updating shipments
...
The spec was asserting on all shipments of the order but there were one.
In consequence, the spec didn't assert anything. Now I set up a shipment
that is asserted on. I'm stil not sure how useful this spec is though.
2024-07-11 15:42:23 +10:00
Maikel Linke
94d560d341
Replace expecting method call with outcome
...
This is more realistic and robust. Don't mock the class under test (even
though `touch` is actually provided by Active Record).
2024-07-11 15:42:22 +10:00
Maikel Linke
eea227bc22
Style order spec block a tiny bit
2024-07-11 15:42:22 +10:00
cyrillefr
ce8a2b3251
Fixes Rails/SkipsModelValidations offenses
...
- increments! & decrement! skip validations
- replaced increment! method calls
- one call was for a redefined increment! method
- the other for a regular(ActiveRecord::Persistence)
- removes increments/decrements definition now useless
2024-07-05 16:35:40 +02:00
Gaetan Craig-Riou
448308710a
Per review, distributor are now updated via variant
...
When a product is deleted, it will delete associated variant and
in turn will touch the affected distributors
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
f73745a803
David's first review changes
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
3788b33eb0
First round of code review change
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
c328ee8087
Remove stockable_by from Product and Variant
...
It's not used anymore
2024-07-03 11:23:02 +10:00
Gaetan Craig-Riou
117f6d3300
First round of code review change
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
260211cf15
Fix Ruboxop issue
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
891f79666d
Spree::Product remove in_supplier_or_distributor scope
...
It is not used anywhere
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
b6faa43879
Fix touching distributor callback spec
...
The original spec check if the supplier and distributor where
updated after deleting product. In reality, the supplier and the
distributor are the same, so no need to test with the supplier
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
3dc7c2bf56
Fix spree product touch supplier
...
Take into account import product scenario, in this case the variant
doesn't have an assigned supplier yet.
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
dd8f0aafab
Fix ProductImport::EntryProcessor#count_existing_items
...
Plus spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
564ea0bd49
Fix enterprise touching when associated record updated
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
5884edaa1b
Fix product import system spec
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
25371ee9d0
Fix admin pages
...
- move supplier to variant row on Bulk Edit product page
- add supplier dropdow on add/update variant page
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
0c9223809b
Fix with_properties scope to accept any number of arguments
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
ef298e3b62
Fix taxon
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
95ed806370
Fix shipment specs
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
612ab097b7
Fix order specs
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
054d967323
Fix line items
...
* fix supplier related code
* Fix associations + plus spec
2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
859f7efd02
Fix Spree:Ability
2024-07-03 10:17:49 +10:00
