raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,092 Commits 20 Branches 453 Tags
fa004d0897da8e31bdd16aeb78be4e252b823935
Commit Graph

11563 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
1f55ff4b72 Merge pull request #12729 from mkllnk/fdc-update 
Remove now unneeded FDC compatibility code from product import
 2024-08-12 11:14:44 +10:00
Filipe
76d874d5f9 Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page 
[BUU] Fixes Products Page ActionView::Template::Error
 2024-08-08 16:20:26 +01:00
Rachel Arnould
81711e4c43 Merge pull request #12721 from dacook/connected-apps-settings-12549 
New settings screen to activate each connected app type
 2024-08-08 16:56:33 +02:00
Ahmed Ejaz
647a384561 12705 - add specs for updating invalid unit_value 2024-08-07 16:59:10 +05:00
Maikel Linke
ec828c335d Remove superfluous FDC-specific request class 2024-08-07 15:09:05 +10:00
Maikel Linke
6d03a8ddf3 Test that the FDC is now complying with the DFC 2024-08-07 15:09:05 +10:00
David Cook
a95aa1b3e9 Submit blank value if nothing selected 
If a checkbox is not selected, the browser does not submit it at all.
 2024-08-07 10:30:45 +10:00
Gaetan Craig-Riou
6139ba3015 Merge pull request #12738 from mkllnk/flaky-exchange-id 
Stabilise spec by not relying on record ids
 2024-08-07 09:41:00 +10:00
Konrad
256d5ba61c Merge pull request #12725 from wandji20/wb-OFN-12280 
(Fix) chore(deps): bump invisible_captcha from 2.2.0 to 2.3.0
 2024-08-06 15:04:38 +02:00
Konrad
cb42e7e119 Merge pull request #12671 from wandji20/wb-OFN-12591 
Ensure product category error message is shown when creating new product [OFN-12591]
 2024-08-06 14:09:59 +02:00
David Cook
5d732d80a6 Add connected apps settings screen 
I considered adding a request spec, but figured it still doesnt' test the form, so better to use a full system spec.
 2024-08-06 11:26:03 +02:00
David Cook
4223b36bc3 Only show enabled connected app types 
The preference will be set from the admin interface in a new commit

It would be nice if we had an array/list type for preferences. Probably not too hard to implement, but this will do.
 2024-08-06 11:26:03 +02:00
David Cook
fcea437d7e Only show connected apps in enterprise settings, if system setting is enabled 2024-08-06 11:26:03 +02:00
Maikel Linke
e055b8b16c Stabilise spec by not relying on record ids 
A spec was referring to and input id:

```
"order_cycle_incoming_exchange_0_variants_#{new_product.variants.first.id}"
```

But sometimes the exchange would have the id 1 instead of 0 and the test
would fail. Instead I opted to select the field by text visible to the
user.
 2024-08-06 12:31:54 +10:00
Maikel
f5875e4c0b Merge pull request #12667 from cyrillefr/FixRailsRootPathnameMethods 
Fixes Rails/RootPathnameMethods offense
 2024-08-06 11:02:28 +10:00
Gaetan Craig-Riou
7e1af9e04b Merge pull request #12723 from johansenja/optimise-shops-page 
Preload enterprise logos and promo images for /shops page
 2024-08-05 13:54:20 +10:00
Filipe
7939bf8038 Revert "Pluralize admin products search result [OFN-12532]" 2024-08-05 10:03:58 +10:00
Ahmed Ejaz
d4e0b2ab51 12705 - fix specs 2024-08-04 18:20:15 +05:00
Ahmed Ejaz
1014a50aff 12705 - incorporate old UI behavior 
- if unit_value is not present and unit_description then display unit_description only.
- if both are not present then display empty fields
 2024-08-04 17:47:02 +05:00
Filipe
5012c52438 Merge pull request #12711 from cillian/wider-item-column-on-invoice-pdf 
Make Item column wider and tax and quantity columns narrower in invoice PDF
 2024-08-02 10:20:24 +01: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
wandji20
a1aea54405 Disable recaptcha spiner check in test environment [OFN-12280] 2024-08-01 21:43:51 +01:00
Joseph Johansen
ffe4603f2f Preload enterprise logos and promo images for shops page 2024-08-01 14:10:53 +01:00
wandji20
ebc794194f Add product spec when supplier is empty and remove error status code from product create action [OFN-12591] 2024-08-01 09:03:26 +01:00
wandji20
287f65ec8e Ensure product category error message is shown when creating new product [OFN-12591] 2024-08-01 08:58:54 +01: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
Cillian O'Ruanaidh
3507405dae Make Item column wider and tax and quantity columns narrower in invoice PDF 2024-07-26 15:36:42 +01:00
Ahmed Ejaz
e808c7fb2b 12705 - set 1 as default for variant's unit_value 2024-07-25 23:42:03 +05: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