raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,683 Commits 20 Branches 451 Tags
05d9646f3e23f9f61928811bc95752647738e839
Commit Graph

1783 Commits

Author SHA1 Message Date
Matt-Yorkley
05d9646f3e Blank out product SKU when cloning a product 
This was effectively being done before for the product's sku (stored on the master variant) via the #duplicate_variant method, but now it needs to be done explicitly on the product in #duplicate_product

(cherry picked from commit 0f253bb2a0)
 2023-06-23 14:16:45 +10:00
Matt-Yorkley
aa9fd682d8 Remove is_master and not_master scopes 
(cherry picked from commit 1daab8994d)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
527e305e2f Set unit_value to true when cloning a product 
This value doesn't get persisted, but it's presence is validated. The product's duplicated variants store the actual :unit_value attribute

(cherry picked from commit 1e36043a2e)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
26d3cffba3 Remove master variant from product 
(cherry picked from commit 3ef7d2c9ff)
 2023-06-23 14:16:44 +10:00
Matt-Yorkley
8e99f496ff Migrate product image from master variant to product 
(cherry picked from commit 7dc1091bc2)
 2023-06-23 14:16:44 +10:00
Maikel
989a88e252 Merge pull request #10848 from mkllnk/totals-report 
Fix error on summarising total_units in Order Cycle Supplier Totals report
 2023-06-14 13:59:48 +10:00
Maikel Linke
6803e0a8f9 Fix error on summarising total_units 2023-06-09 09:55:33 +10:00
Neal Chambers
b04879604a Rewrite Ternary Expression to Prevent Layout/LineLength 2023-06-08 15:20:04 +10:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Maikel
add725b6c0 Merge pull request #10861 from mkllnk/dfc-import 
Update products with DFC Prototype
 2023-06-01 08:48:39 +10:00
Maikel Linke
67c29dd38f Activate DFC provider engine, remove feature toggle 2023-05-28 10:39:08 +02:00
David Cook
31fa9c2c04 Add admin_style_v3 feature toggle 2023-05-26 15:10:27 +10:00
Filipe
0d23b63bbd Merge pull request #10779 from dacook/10634-remove-admin_style_v2 
10634 Remove admin_style_v2 feature
 2023-05-17 15:37:05 +01:00
Jean-Baptiste Bellet
aaa9bac4dd Remove white_label feature toggle 
White label is now activated for everyone.

+ add mock for `spec/controllers/spree/orders_controller_spec.rb`
 2023-05-15 17:10:50 +02:00
Gaetan Craig-Riou
d715b6b3bb Spec fix LocalisedNumber validation to allow negative number 
As part of this PR https://github.com/openfoodfoundation/openfoodnetwork/pull/10329
LocalisedNumber validation was tightened, but that means negative number
were not valid anymore.

This commit has been cherry-picked after this fix has already been
applied. Now we just change the order of characters in the regex because
humans are used to reading the minus at the beginning of the number. But
this change doesn't change the logic at all.
 2023-05-15 10:55:59 +10:00
filipefurtad0
e7ab839fb3 Adds minus sign as validation criteria 
Removes pending from passing examples
 2023-05-14 23:02:44 +01:00
David Cook
04a5c7452e Remove admin_style_v2 description 
Partially reverts 9a1b1498bf
 2023-05-09 21:26:47 +10:00
Matt-Yorkley
4b707b9310 Extract locale file digest logic to a separate class and add tests 2023-05-08 14:09:00 +01:00
Konrad
4303cabe56 Merge pull request #10792 from mkllnk/feature-deletion 
Remove unknown (deleted) feature toggles at boot
 2023-05-08 14:49:42 +02:00
Maikel
ad033e8d44 Merge pull request #10767 from Matt-Yorkley/remove-session-cookie-upgrader 
Remove SessionCookieUpgrader from middleware
 2023-05-08 12:50:42 +10:00
Konrad
b60a6fbd05 Merge pull request #10329 from thejwuscript/9861-improve-input-validation 
Improve input validation on new and edit Payment Method pages
 2023-05-03 16:11:21 +02:00
Maikel Linke
b30e962cdd Remove unknown (deleted) feature toggles at boot 2023-05-03 15:20:26 +10:00
Maikel Linke
9f0a66659a Delete now unused SessionCookieUpgrader 2023-05-01 13:35:52 +10:00
Maikel Linke
dae8703b02 Remove unused feature to intercept emails 
This option came from Spree and we never used it. The config input field
is disabled in the admin interface and I checked our managed databases.

I don't think that we will want this feature in the future either.
Staging sends unmodified emails which is more realistic and we haven't
had a use case to intercept those emails. There's still the BCC option
if we need additional access.
 2023-04-26 13:50:31 +10:00
Maikel
0b03152f3b Merge pull request #10697 from mkllnk/rubocop-config-update 
Update Rubocop config and replace deprecated TimeWithZone#to_s with argument
 2023-04-19 11:23:34 +10:00
David Cook
364ccc2146 Add comment 2023-04-18 09:39:39 +10:00
James Wu
29ddc68d20 Fix duplicate validation error message 2023-04-18 09:39:39 +10:00
James Wu
7af26e6579 Add errors for invalid input with number localization enabled 2023-04-18 09:39:39 +10:00
James Wu
ee30d3d139 Fix PaymentMethodFactory creating extra Calculator 2023-04-18 09:39:39 +10:00
Konrad
e91e827f29 Merge pull request #10664 from abdellani/fix-remove-duplicated-cusomter-from-mailing-list-report 
Fix Repeated customer entries on Mailing List Report
 2023-04-16 21:17:33 +02:00
Konrad
8f201c830a Merge pull request #10665 from abdellani/fix-remove-duplicated-cusomter-from-addresses-list-report 
Fix Repeated customer entries on Addresses List Report
 2023-04-16 20:40:56 +02:00
Maikel Linke
efb2ae6843 Style Rails/Pick - rubocop passes completely 2023-04-14 16:22:46 +10:00
Maikel Linke
407fca17cb Style Rails/IndexWith 2023-04-14 16:19:21 +10:00
Mohamed ABDELLANI
061fc321b4 group records before rending the report 2023-04-07 18:44:19 +01:00
Mohamed ABDELLANI
5201e54f82 group orders before rendering the report 2023-04-07 18:16:12 +01:00
Jean-Baptiste Bellet
e74328f1d7 Add i18n for payment state key 
+ update spec
 2023-04-06 10:28:44 +02:00
Jean-Baptiste Bellet
6abd652251 Factorize into inherited method from Base: payment_state(order) 2023-04-06 09:50:50 +02:00
Jean-Baptiste Bellet
4fa44e6c64 Put the white label behind a feature toggle white_label 
+ update specs as well

+ for admin section also
 2023-03-30 09:19:17 +11:00
Gaetan Craig-Riou
c7c19e47de Add feature toggle description 2023-03-28 13:46:51 +11:00
Maikel
a168126cfa Merge pull request #10600 from mkllnk/features 
Add all feature toggles with descriptions at boot
 2023-03-28 10:58:40 +11:00
David Cook
c27974c5a3 Add marker for summary rows 
This can be enabled in the reports API with the hidden parameter `fields_to_show[]=report_row_type` to help with parsing summary row output.
 2023-03-22 11:47:26 +00:00
David Cook
6f41a4168d Allow headers and footers for JSON format 
You wouldn't want it by default, but it can be enabled with a parameter like display_summary_row=true
 2023-03-22 11:47:26 +00:00
David Cook
db7ac904e9 Allow column formatting and header/footer stripping to be specified independently 
This will allow us to change the options in the following commit.
 2023-03-22 11:47:26 +00:00
Maikel Linke
fd68cbf56d Remove on-the-fly adding of feature toggle entries 
We now have a new source of truth. You shouldn't use a feature toggle
without adding it to OpenFoodNetwork::FeatureToggle first. All toggles
are added at boot time already.
 2023-03-22 15:36:08 +11:00
Maikel Linke
9a1b1498bf Add all feature toggles with descriptions at boot 
So you can easily inspect and activate new features without trying to
use them first. It brings more visibility and will enable us to easily
remove retired features as well.
 2023-03-22 15:36:08 +11:00
Maikel Linke
b5f43b3c1c Rename method because it's not changing the input 
A common Ruby convention is to to use the bang naming `!` to mark method
which change the given parameter instead of returning a copy.
 2023-03-21 14:30:44 +11:00
Maikel Linke
fcc68a0a19 Return new filtered list instead of modifying 
This makes a clear distinction between the unfiltered and filtered list.
There may also be some gotchas when modifying the array of an
ActiveRecord relation. It also allows us to write shorter code without
storing a separate variable.
 2023-03-21 14:30:44 +11:00
Maikel Linke
eee5e8eee7 Remove unnecessary tag rule code 
The applicator converts the input to an array, even `nil` becomes an
empty array. Iterating over an empty array doesn't do anything either,
the result is the same.
 2023-03-21 14:30:44 +11:00
Maikel
890ab6796e Merge pull request #10413 from mkllnk/reports-params 
Fix background processing of Enterprise Fee Summary report
 2023-02-28 13:07:59 +11:00
Maikel Linke
800ccf5037 Remove unused method 2023-02-24 10:40:09 +11:00