raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,946 Commits 21 Branches 450 Tags
bbe22bbfeb7b974d54c863ddafa2b8a475e67f12
Commit Graph

31946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
bbe22bbfeb AddTypeToConnectedApps 2024-07-25 17:06:13 +10:00
David Cook
85d5e2ee70 Expect single connected_app record for discover regen 2024-07-25 17:05:42 +10:00
David Cook
9a4051f37b Move discover regen to named partial 
To make way for a new type of connected app.

If only we could use [relative partial paths](https://github.com/rails/rails/issues/1143)
 2024-07-25 17:05:42 +10:00
Gaetan Craig-Riou
99acf752f4 Update all locales with the latest Transifex translations v4.5.3 2024-07-24 15:34:16 +10:00
Gaetan Craig-Riou
dfea0cd805 Merge pull request #12700 from rioug/fix-number-rounding-with-hu-locale 
[BUU] fix error 500 on hungary instance
 2024-07-23 16:35:48 +10:00
Gaetan Craig-Riou
0f04b2fb10 Fix call to ActiveSupport::NumberHelper.number_to_rounded 
When running with :hu locale, call to `number_to_rounded` wiht parameter
precision: nil breaks, adding significant: false fixes the issue
 2024-07-23 13:51:32 +10:00
Filipe
146296d0b2 Merge pull request #12694 from rioug/12692-revert-product-desxription-tuncation 
Revert product description truncation fix
v4.5.2 		2024-07-22 12:22:56 +01:00
Gaetan Craig-Riou
7f9bbd23e5 Revert fix introduced in https://github.com/openfoodfoundation/openfoodnetwork/issues/10685 
It breaks wit Safari on Iphone
 2024-07-22 14:59:30 +10:00
Gaetan Craig-Riou
5caeb160ef Merge pull request #12684 from dacook/fix-spec 
Fix flaky spec
 2024-07-22 11:59:22 +10: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
David Cook
0c43dd4222 Merge pull request #12686 from filipefurtad0/activate_25_p_cent_BUU_users 
Activates admin_style_v3 for 25 per cent users
 2024-07-22 10:28:19 +10:00
filipefurtad0
17eb8d5cd8 Update all locales with the latest Transifex translations 2024-07-19 10:09:29 +01:00
filipefurtad0
c8ca993fa9 Activates admin_style_v3 for 25 per cent users 2024-07-18 16:39:35 +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
David Cook
bba59c1ffd Force significant: false for NumberHelper 
Although it defaults to false, somehow it seems to be evaluated as true on hu_prod...??!?!!1! (https://github.com/openfoodfoundation/openfoodnetwork/issues/12682)
Maybe this will help.
 2024-07-18 11:06:45 +10:00
Filipe
f3e7ba0462 Merge pull request #12675 from zsoltiNagy/insert_cloned_below_the_original_product 
Changed a single line in turbo to insert cloned products after the original product
 2024-07-17 20:14:13 +01: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
Filipe
3bd5ae2eec Merge pull request #12680 from rioug/12670-fix-product-ordering-inventory 
[inventory] Fix product sorting
 2024-07-17 17:53:16 +01:00
filipefurtad0
0123d6fb2e Copies admin_style_v3 feature into ACTIVE_BY_DEFAULT section 
This should have an effect on test environment
 2024-07-17 14:51:29 +01:00
filipefurtad0
e0d7252fe3 Adds condition for dev environment only 
We don't want to enable this in production just yet
 2024-07-17 14:51:29 +01:00
filipefurtad0
24defac470 Adds a migration to enable the feature by default 2024-07-17 14:51:29 +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
zsoltiNagy
c25750387f Changed a single line in turbo to insert cloned products after the original product 2024-07-16 07:23:03 +02: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
c52c2ebfe1 12570 - fix specs 2024-07-12 18:20:19 +05: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
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
David Cook
6d6f8735e3 Update all locales with the latest Transifex translations v4.5.1 2024-07-11 14:41:47 +10:00
Maikel
aec9a960e2 Merge pull request #12652 from filipefurtad0/activate_admin_style_v3_for_dev_test_and_new_servers 
[BUU] Prepares specs for enabling admin_style_v3 by default
 2024-07-11 13:55:20 +10:00
Maikel
f1713b11a6 Merge pull request #12657 from dacook/buu/enable_feature_admin_style_v3_for_admins 
[BUU] Activate admin_style_v3 for all super admins
 2024-07-11 13:40:32 +10:00
David Cook
c86f7f9d50 Remove comments 2024-07-11 10:58:57 +10:00
filipefurtad0
5e933af079 Prepares spec for admin_style_v3 - replaces TODO (1) 2024-07-11 10:58:57 +10:00
filipefurtad0
f7c47fecc4 Removes the need for using overlapping_elements_helper 
Improves the specs so we don't need to recurr to overlapping elements clicks, and removes the respective helper
 2024-07-11 10:58:57 +10:00
filipefurtad0
7d1cb0c957 Sets up enterprise with payment and shipping methods 
So that the warning does not need to be dismissed - which is not what we wish to test here
 2024-07-11 10:58:57 +10:00