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,114 Commits 20 Branches 451 Tags
3ec58d879110866721d325cc628cbf50d3e8d328
Commit Graph

9578 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
3ec58d8791 Add #vouchers, return an array of voucher adjustments 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
9b680e1a92 Add CalculatedAdjustments to Voucher 
Vouchers are only flat rate of 10 for now, so we add a FlatRate
calculator in a before_validation callback
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
Maikel
4f7059d0c7 Merge pull request #10838 from filipefurtad0/fix_negative_adjustment_error 
Adds minus sign to validation criteria
 2023-05-15 11:07:45 +10: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
0442f2da7e Fixes spec warning 
An example was being ignored due to legacy syntax - WARNING: ignoring the provided expectation message argument since it is not a string or a proc.
 2023-05-14 23:02:44 +01:00
filipefurtad0
e7ab839fb3 Adds minus sign as validation criteria 
Removes pending from passing examples
 2023-05-14 23:02:44 +01:00
filipefurtad0
596b318778 Adds spec on negative adjustment 
with different localization settings

Using shared examples and setting failing

ones as pending
 2023-05-14 23:02:00 +01:00
Maikel Linke
87c4c5373b Spec more variant naming with realistic data 2023-05-12 14:10:54 +10:00
Maikel Linke
f70607259a Spec Variant#product_and_full_name with real data 
Mocking skips a lot of code execution which we want to test as well.
 2023-05-12 13:34:34 +10:00
Maikel Linke
ce180caad9 Test with in-memory data when possible 
This should speed up specs but I observed only one second less run time.
 2023-05-12 13:21:58 +10:00
Maikel Linke
01be934caf Reduce spec run time by not creating unused subject 
The `variant` instance isn't used in all specs and doesn't need to be
created every time. This reduced run time from 1min5sec to 43sec on my
machine.
 2023-05-12 13:21:58 +10:00
Maikel Linke
54c6559b97 Move Spree::Variant spec out of Spree module 
I also discovered that some specs were just in the Spee module and not
within the `describe Variant` block. I moved them inside the block.
 2023-05-12 13:21:19 +10:00
filipefurtad0
f5eb72c804 Adds sleep(1) 2023-05-11 11:29:24 +01:00
Konrad
2836751698 Merge pull request #10805 from jibees/10717-bo-orders-changing-customer-does-not-update-customer_id 
Admin, Edit customer details for an order: when changing to another customer, update `customer_id` as well
 2023-05-10 19:08:57 +02: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 Linke
2a943ecafb Spec setting up all feature toggle names 2023-05-05 11:09:10 +10:00
Jean-Baptiste Bellet
3a1579104f Submit customer_id as params when updating customer details on order 2023-05-04 16:40:58 +02:00
Konrad
4b6ef7796e Merge pull request #10762 from mkllnk/report-encoding 
Preserve encoding of stored reports
 2023-05-03 17:08:44 +02: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
5f1f717974 Spec FeatureToggle.setup! 2023-05-03 15:02:08 +10:00
Maikel Linke
b6f2fe0e92 Avoid defining modules in specs 
We avoid some indent and show how code outside of the module works.
 2023-05-03 14:58:59 +10:00
Gaetan Craig-Riou
d1f7cc1b2a Merge pull request #10764 from Matt-Yorkley/remove-data-hooks 
Remove `data-hook` attributes
 2023-05-02 16:35:46 +10:00
Maikel
482d438ec9 Merge pull request #10766 from filipefurtad0/remove_asertion_on_js_element_loading_orders 
Removes assertions on transient JS element - "Loading orders"
 2023-05-01 13:36:44 +10:00
Konrad
1176ea2a5f Merge pull request #9941 from basilawwad/conditionally-send-cancellation-email 
Conditionally send cancellation email when cancelling order.
 2023-04-28 21:54:42 +02:00
Matt-Yorkley
b9431cd121 Remove data-hook attributes 2023-04-28 13:03:13 +01:00
filipefurtad0
74d18fb6ff Removes assertions on transient JS element 2023-04-28 12:48:59 +01:00
Maikel Linke
630169f8bb Preserve encoding of stored reports 
Active Storage reads stored strings as ASCII and that can clash with
Rails' default UTF-8 encoding when special characters are present.
 2023-04-28 16:38:06 +10:00
Gaetan Craig-Riou
152af5e105 Merge pull request #10751 from mkllnk/mail-config 
Remove unused feature to intercept emails
 2023-04-28 16:28:41 +10:00
David Cook
918425fd93 Remove customised error message 
We're now handling these values on the frontend, so can keep this simple.

fixes up:
 Add numericality validation for *
 Add translation for Active Record error message
 2023-04-28 14:02:12 +10:00
David Cook
a46eef291c Remove localized number logic from calculators 
The browser is now responsible for dealing with the decimal separator, for all numeric preferences (as input[type=number]; see Spree::Admin::BaseHelper::preference_field_tag). Calculators are the only place that numeric preferences are used.

It will enforce that only one comma or dot (depending on user's locale) is entered, thus avoiding any ambiguity, and mis-interpretation (eg 100,001 could be interpreted as more than 100 thousand or 100 with a decimal place).
 2023-04-28 13:54:16 +10:00
Jean-Baptiste Bellet
b1de28eeea When there is a white_label_logo_link pref. use it! 
+ update spec as well

 + use an an helper to get the main logo link for a shopfront

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
35778ecf1d If enterprise has a white_label_logo attached, then can edit its link 2023-04-26 11:04:47 +02: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
filipefurtad0
edb8da4b4d Considers recent changes on login test helpers 
PR #10696 introduced changes on the login helpers which were not considered, when merging a recent PR; This broke the build
 2023-04-24 18:35:10 +01:00
Konrad
00d5bd9165 Merge pull request #10684 from MadisonBowron/master 
Fix admin product variants form to close issues #10579 & Wishlist: 430
 2023-04-24 18:18:01 +02:00
Jean-Baptiste Bellet
1730c9eb60 Fix one warning: Modal window with text has been opened, ... 
```
Modal window with text `An invoice for this order will be sent to the customer. Are you sure you want to continue?` has been opened, but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` | `dismiss_confirm` | `accept_alert`), accepting by default
```
 2023-04-24 15:18:35 +02:00
Jean-Baptiste Bellet
5b9815f4a3 Test that restock has been called or not, depending on checkbox checked 2023-04-24 15:03:14 +02:00
Konrad
75b5d1fd6f Merge pull request #10712 from jibees/6133-backoffice-orders-endless-spinner-and-error-500-after-skipping-oc-selector 
Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)
 2023-04-22 16:04:15 +02:00
Gaetan Craig-Riou
2f17a02974 Merge pull request #10726 from mkllnk/spec-email-helper 
Remove useless email test setup
 2023-04-21 15:43:19 +10:00
Gaetan Craig-Riou
3810d79cad Merge pull request #10695 from macanudo527/rename_inversables 
Rename Inversable Method Names
 2023-04-21 11:38:58 +10:00
Jean-Baptiste Bellet
81606e841a Canceling an order: clicking on cancel btn or cancel action in dropdown 2023-04-20 14:38:59 +02:00
basilawwad
e633670e01 Use a shared_examples for the order cancellation tests 2023-04-20 14:38:59 +02:00
Jean-Baptiste Bellet
ba45dd84dd Solves rubocop linter errors 2023-04-20 08:46:19 +02:00
Jean-Baptiste Bellet
f42f513f8c Display white_label_logo image when hide_ofn_navigation is set to true 
for both desktop and mobile view
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
54342254b6 Do not show white label logo is hide_ofn_navigation is not checked 
They are both strongly linked
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
470761da86 Add a simple CheckboxDisplay controller that show/hide content 
depending on the checkbox state (checked or not)
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
6fdf9fa038 Add/Remove white label logo in enterprise preferences panel 2023-04-20 08:45:03 +02:00