raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,011 Commits 18 Branches 453 Tags
675b7febdf16cfffb00a0579f34494c7eb2bd785
Commit Graph

11538 Commits

Author SHA1 Message Date
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
Maikel Linke
99b31d05cb Fix flaky spec with fixed order of products 2024-08-02 14:26:54 +10:00
Konrad
1a72b5b227 Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator 
Display only per_item fees for oc incoming exchange #11326
 2024-08-02 03:11:27 +02:00
Filipe
ce44f19b4a Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet 
Fixes 422 error due to bad sql building
 2024-07-31 19:45:09 +01:00
Filipe
6c214543ad Merge pull request #12690 from wandji20/wb-OFN-12666 
Require variant category and supplier when creating new product variants [OFN-12666]
 2024-07-31 19:28:31 +01:00
Filipe
8b1713d169 Merge pull request #12665 from wandji20/wb-OFN-12532 
Pluralize admin products search result [OFN-12532]
 2024-07-31 18:55:53 +01: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
wandji20
55df9416cc Add test to check when new variant category and producer is empty [OFN-12666] 2024-07-30 12:09:59 +01:00
wandji20
0376c04ad5 Fix failing specs [OFN-12666] 2024-07-30 12:07:50 +01:00
wandji20
2709479bf2 Require varian t category when creating new product variant [OFN-12666] 2024-07-30 12:07:50 +01: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
fece8beef5 Style/Send 2024-07-29 14:13:22 +10:00
David Cook
53e3621e04 Merge pull request #12703 from johansenja/fix-rubocop-style-send 
Fix rubocop Style/Send group
 2024-07-29 14:02:01 +10:00
Konrad
325f9aa6f3 Merge pull request #12664 from wandji20/wb-OFN-12551 
Remove SR from clear search button [OFN-12551]
 2024-07-28 14:31:08 +02:00
Abdul Aziz Ali
8a1e61fd60 Fix incoming_controller_spec. Remove .order_cycle_id usage #11326 2024-07-27 17:54:39 +08:00
David Cook
df81e8ed35 Add task to connect all enterprises 
Example usage:
 rake ofn:enterprises:activate_connected_app_type[affiliate_sales_data]
 2024-07-25 21:14:04 +10:00
David Cook
e9d7a0b099 Add User#affiliate_enterprises 2024-07-25 21:14:01 +10:00
David Cook
da7bbcf82f Enable/disable affiliate sales data 2024-07-25 17:06:13 +10:00
David Cook
27e53f9dcc Scope spec to section 
Because there's going to be a new section with the same button label
 2024-07-25 17:06:13 +10:00
David Cook
5d0f55b8c3 Re-organise spec 
Best viewed with whitespac ignored.
 2024-07-25 17:06:13 +10:00
cyrillefr
05ed4639b2 Fixes 422 error due to bad sql building 
- first part of query use supplier_properties parameter, but not
  second part, that can leads to mismatch between the 2 parts.
  Remove supplier_properties parameter + modify SQL to get it right.
- spec tests category filtering & sorting + producer properties
 2024-07-24 21:49:11 +02:00
Abdul Aziz Ali
2bcf84d9a9 Add outgoing exchange scenario spec #11326 2024-07-24 17:38:10 +08:00
Joseph Johansen
5086f2d8b5 Fix rubocop Style/Send group 2024-07-23 14:18:26 +01:00
David Cook
1310965975 Scope expectations to product/variant rows 
This spec was getting flaky because:

> expected not to find text "20"
> in "Logged in as : olen@harveydenesik.biz Account Logout ... Weight (g) YES 1g On demand Enterprise 203 Enterprise 203
 2024-07-22 11:42:50 +10:00
wandji20
bb427db66a Add spec for clearing search input when no results is found [OFN-12551] 2024-07-19 14:25:46 +01:00
Rachel Arnould
de20dd949b Merge pull request #12668 from filipefurtad0/prepare_import_spec_for_admin_style_3 
Prepare product_import_spec.rb for BUU as default
 2024-07-18 16:33:56 +02:00
Konrad
4c9507caa3 Merge pull request #12602 from chahmedejaz/bugfix/12570-variant-unit-field-out-of-sync 
12570 - Fix Variant Unit field is Out of Sync with the Pop-out
 2024-07-18 13:32:27 +02:00
Filipe
f1e6f8bb66 Merge pull request #12683 from dacook/buu-troubleshoot-12682 
[BUU] Handle corrupt data and troubleshooting
 2024-07-18 12:28:18 +01:00
David Cook
918d4401ff Gracefully handle empty string 2024-07-18 12:05:56 +10:00
David Cook
4925e2088d Test for corrupt data 
Ah ha, we found the problem.
 2024-07-18 12:03:25 +10:00
Filipe
23fc77351e Merge pull request #12663 from cyrillefr/Inventory_Producer_column_is_empty_in_review_page 
Replace product by variant to see producer name on views
 2024-07-17 18:17:58 +01:00
filipefurtad0
46696dfa17 Removes references to enabling admin_style_v3 features 
Reverts removal from bulk_product_spec.rb
 2024-07-17 14:51:25 +01:00
Gaetan Craig-Riou
ae3fa00429 Add ordering by producer and product name 
It looks like the ordering by producer got lost in some rebase.
 2024-07-17 11:22:49 +10:00
wandji20
80ade22bd6 Pluralize admin products search result [OFN-12532] 2024-07-16 13:10:22 +01:00
Ahmed Ejaz
5b7fbc875a 12570 - address PR comments 2024-07-15 22:48:20 +05:00
filipefurtad0
e1976c6cc2 Brings back xpath selector 
Fixes xpath
 2024-07-15 11:32:04 +01:00
filipefurtad0
91daec4806 Removes TODO, preparing spec for admin_style_3 (1) 
Removes TODO, preparing spec for admin_style_3 (2)

Uses xpath to point to on hand field
 2024-07-15 11:32:04 +01:00
filipefurtad0
bdc42deeb6 Sets import column test as pending 
As of now, it is not clear whether we wish to re-implement this feature on BUU
 2024-07-15 11:32:04 +01:00
David Cook
a66fec0b26 Merge pull request #12662 from mkllnk/order-finalise-spec 
Improve spec for Spree::Order#finalize!
 2024-07-15 11:53:57 +10:00
Ahmed Ejaz
d8354298f5 12570 - add specs 2024-07-12 18:02:57 +05:00
Ahmed Ejaz
0986971473 12570 - fix variant's display_as field being empty issue 
- New variant unit_value is empty, so +VariantUnits::OptionValueNamer.new(variant).name+ returns ""
- Now we are making sure that new variant unit_value won't be empty
 2024-07-12 17:00:42 +05:00
Gaetan Craig-Riou
29aa3a8059 Remove useless code 2024-07-12 10:34:42 +10:00
Konrad
e09745179f Merge pull request #12649 from dacook/product_import-tmpfile 
Use application tmp dir for product import
 2024-07-11 19:53:32 +02:00
cyrillefr
49c6a22fde Replace product by variant to see producer name on views 
- replace product by variant since there had been changes in
  product & variant models.
- add a line in spec to test producer name.
 2024-07-11 13:41:49 +02: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