raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,369 Commits 17 Branches 454 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

2224 Commits

Author SHA1 Message Date
paulo-felipe
8c709e13e0 lint(spec/system/admin/subscriptions_spec.rb): issue #7483 
Solve line too lng offense.
 2023-05-19 19:55:27 -03:00
paulo-felipe
c63a8d12f7 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page and adding a product AND deleting the existing product AND adding a new product and click next button.
 2023-05-19 19:55:26 -03:00
paulo-felipe
5a5aa4c067 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page and adding a product AND deleting the existing product AND adding a new product.
 2023-05-19 19:55:26 -03:00
paulo-felipe
5776bdb31c refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page and adding a product AND deleting the existing product.
 2023-05-19 19:55:26 -03:00
paulo-felipe
b0623ab4de refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page and adding a product.
 2023-05-19 19:55:26 -03:00
paulo-felipe
f05e2618be refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page and click next button without adding at least one product.
 2023-05-19 19:55:26 -03:00
paulo-felipe
35ce463811 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on third page.
 2023-05-19 19:55:26 -03:00
paulo-felipe
7efc68281e refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context when using copy button to fill in ship address.
 2023-05-19 19:55:26 -03:00
paulo-felipe
aa16110e9a refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context when resetting the billing address after clearing the bill address. MOve scenario to its before do block.
 2023-05-19 19:55:26 -03:00
paulo-felipe
39a76861f3 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context when resetting the billing address after clearing the bill address.
 2023-05-19 19:55:26 -03:00
paulo-felipe
79ff13e8ba refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Move on second page to a before action and clearing some elements of bill address to a before action. Let the unit test with the action isolated.
 2023-05-19 19:55:26 -03:00
paulo-felipe
573ab1beb0 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context on second page when clearing some elements of the bill address.
 2023-05-19 19:55:26 -03:00
paulo-felipe
384ad1ba12 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Group context for first page scenarios. Extract common customer actions to its before do block.
 2023-05-19 19:55:26 -03:00
paulo-felipe
77857a0168 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Add context when date field is filled. It goes to the next page with preloaded data.
 2023-05-19 19:55:26 -03:00
paulo-felipe
47b0d626e2 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Isolate when no field is filled on first screen describe it better as per reviewer suggestion.
 2023-05-19 19:55:26 -03:00
paulo-felipe
0bf7e53ce4 refactor(spec/system/admin/subscriptions_spec.rb): issue #7483 
Isolate when no field is filled on first screen.
 2023-05-19 19:55:26 -03:00
Konrad
fed7c3da51 Merge pull request #10761 from rioug/vouchers-any-amount 
[Vouchers] Flat rate of any amount
 2023-05-19 17:39:33 +02:00
filipefurtad0
8d2885e147 Updates spec after merging #10512 2023-05-18 16:04:30 +01:00
filipefurtad0
51b144f174 Covers editing into invalid combinations 2023-05-18 15:59:48 +01:00
filipefurtad0
4e2095f0fb Tests enterprise fee creation 
...when inheriting tax category from product

as shared examples
 2023-05-18 15:59:48 +01:00
filipefurtad0
c99829e457 Updates spec to reflect change on en.yml 2023-05-18 12:11:37 +01:00
saunmanoj888
aee7645e29 Fix searching issue with full name on bulk order management 2023-05-17 13:14:10 +02:00
Konrad
4a66b62fa7 Merge pull request #10825 from jibees/10824-remove-feature-toggle-on-white-label-feature 
Activate white label feature
 2023-05-16 13:50:58 +02:00
Gaetan Craig-Riou
2d8fa24862 Add a voucher factory 
As vouchers are getting more complicated, it makes sense to use a
factory to simplify writing test.
 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b427e420ce Update admin pages to allow entering an amount 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
15eee8175e Add amount to voucher 
Change value to amount to be more consistent
 2023-05-16 16:19:59 +10:00
Maikel
10c918be75 Merge pull request #10732 from mkllnk/report-email 
[Hidden] Notify about completed report with download link via email
 2023-05-16 10:25:23 +10:00
Maikel
a979f7c8df Merge pull request #10587 from rioug/10432-vouchers-bare-minimum-checkout 
10432 vouchers bare minimum checkout
 2023-05-16 09:19:06 +10:00
Maikel Linke
5ae04a5a3e Hide report link which only works at unknown time 
It was bad UX to show a link that doesn't work straight away. At the
time, it was the only way to download the report but now we send an
email which is a much better way to go.

I leave the rest of the code because we want to implement a reflex which
shows the download link once it's ready.
 2023-05-15 19:41:45 +02:00
Maikel Linke
299bc253a4 Expire report download links in a month, not 5mins 2023-05-15 19:41:45 +02:00
Maikel Linke
860fe85af9 Add report download link to email notification 
I added a system spec to verify that the download link can be generated
within the mailer in a background job. ActiveStorage is a bit particular
when it comes to genererating URLs and depending on the situation it may
generate a redirect URL, a proxy URL or link directly to the storage.
But we want a redirect URL here.
 2023-05-15 19:41:45 +02: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
jibees
d43678c68b Merge pull request #10827 from filipefurtad0/logging_out_spec 
Adds test case for logging out
 2023-05-15 15:33:56 +02:00
jibees
1e05bc5b5c Merge pull request #10789 from jibees/10770-bom-cancelling-an-order-always-restocks-the-line-item 
BOM: when deleting the last item of order that leads to order cancellation, take into account the restock items checkbox
 2023-05-15 09:50:13 +02:00
Gaetan Craig-Riou
b67f5ae154 Fixing Rubocop issue 
My editor automatically remove blank character on empty line, that's
why rubocop got grumpy here.
 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
aa526a639c Checkout payment page, enable voucher "apply" button when code entered 
The "apply" button is disabled by default. If left enabled, a customer
could try to apply an empty voucher, which results in system trying
to move to the order summary step, an unexpected behaviour!
We only enable the button when something is entered in the input.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
815dcbcefe Fix translations 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
2f1fe6d096 Fix rubocop warning 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
43ab881181 Rename order association to voucher_adjustments 
The name vouchers is a bit confusing as the order is linked to a
voucher adjutment and not the actual voucher
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
a1ad25f217 Fix failing specs 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
9789911523 Rework how voucher are applied to an order and handle tax calculation 
At the time when we can apply a voucher to an order (payment step) we
don't have any data on possible taxes and payment fees. These are
calculated when we move to the summary step. So voucher are applied in
two step:
- create an "open" voucher adjustment on the order when a customer enters
a voucher code.
- when we move to the summary step, recalulate the amount and
possible tax for the voucher adjustment, once taxes and payment fees
have been included in the order. And then close the original and update
order to reflect the changes
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
d157d91054 When voucher cover more than order total, use only amount needed 
The checkout payment step will also show a warning.
The amount used is stored in the adjustment created, so we will be able
to track how much has been used down the line.
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
74a8730f04 Highlight voucher on order summary step 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
a9d9b33f7d First take at adding a voucher to an order 
Use voucher.create_adjustment to add an adjustment to the order
Currently doesn't take into account tax part
 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
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
Jean-Baptiste Bellet
f679d8733e Pass the restock_items params to each methods and request call 
+ update spec to test whether the restock item checkbox is checked or not.
 2023-05-11 22:58:44 +02:00