raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,858 Commits 19 Branches 454 Tags
0f47ec0094b2541d5c3acd416ff596b68af075c0
Commit Graph

158 Commits

Author SHA1 Message Date
Konrad
3b9ebf4e07 Merge pull request #11396 from abdellani/fix-if-tos-is-not-set 
fix If ToS file is not set, customer needs to accept Terms on each checkout
 2023-09-06 16:56:21 +02:00
Maikel Linke
1a95476634 Combine some voucher system specs to save time 
It also simplifies the spec code a bit not having a shared example.
 2023-08-25 13:56:41 +10:00
Maikel Linke
233171a9ce De-flake voucher specs by checking success 
Vouchers are applied via a reflex and we need to check for success
before trying to navigate further. The new helper does this in a
consistent way.
 2023-08-25 13:56:41 +10:00
Maikel Linke
4be38ba8da Remove redundant system spec 
System specs are expensive. And this spec just looked for the visibility
of certain elements while other tests actually use them and therefore
verify their function much more thoroughly.
 2023-08-25 13:56:41 +10:00
Mohamed ABDELLANI
f9e6f8bfa5 fix existing tests 2023-08-23 11:50:33 +01:00
Neal Chambers
94f1b89a9f Safely autocorrect Rails/RootPublicPath 
Inspecting 1484 files
.............................................................................................C........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................................................C..........C..........................................................................................................................................................................................................................................................................................................C....................................................................................................................................................................C...................C.............................................................C.C.......C....................

Offenses:

app/controllers/concerns/request_timeouts.rb:19:22: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
               file: Rails.root.join("public/500.html"),
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/spree/core/controller_helpers/common.rb:45:30: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
                       file: Rails.root.join("public/404.html"),
                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/controllers/api/v0/product_images_controller_spec.rb:13:22: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
    let(:pdf_path) { Rails.root.join("public/Terms-of-service.pdf") }
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/controllers/api/v0/terms_and_conditions_controller_spec.rb:15:31: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
      let(:terms_file_path) { Rails.root.join("public/Terms-of-service.pdf") }
                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/models/terms_of_service_file_spec.rb:6:25: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
  let(:pdf) { File.open(Rails.root.join("public/Terms-of-service.pdf")) }
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/admin/bulk_product_update_spec.rb:907:37: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        attach_file 'image-upload', Rails.root.join("public/500.jpg"), visible: false
                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/admin/enterprises/terms_and_conditions_spec.rb:27:30: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
      let(:original_terms) { Rails.root.join("public/Terms-of-service.pdf") }
                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/admin/enterprises/terms_and_conditions_spec.rb:28:29: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
      let(:updated_terms) { Rails.root.join("public/Terms-of-ServiceUK.pdf") }
                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/consumer/shopping/checkout_spec.rb:94:9: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        Rails.root.join("public/Terms-of-service.pdf"),
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/consumer/shopping/embedded_groups_spec.rb:18:9: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        Rails.root.join("public/embedded-group-preview.html")
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/consumer/shopping/embedded_groups_spec.rb:26:9: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        Rails.root.join("public/embedded-group-preview.html")
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/consumer/split_checkout_spec.rb:986:35: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        let(:system_terms_path) { Rails.root.join("public/Terms-of-service.pdf") }
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/system/consumer/split_checkout_spec.rb:987:33: C: [Corrected] Rails/RootPublicPath: Use Rails.public_path.
        let(:shop_terms_path) { Rails.root.join("public/Terms-of-ServiceUK.pdf") }
                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1484 files inspected, 13 offenses detected, 13 offenses corrected
 2023-08-14 17:29:11 +09:00
Gaetan Craig-Riou
619285ad4a Add voucher_type to voucher 
And update related specs
voucher_type doesn't do anything for now.
 2023-08-11 14:19:25 +10:00
Konrad
c3414143e6 Merge pull request #11222 from Matt-Yorkley/checkout-controller 
Reduce controller size
 2023-08-10 23:28:57 +02:00
Maikel
b50fa216eb Merge pull request #11117 from rioug/10857-voucher-error-moving-between-summary-and-cart-take2 
[vouchers] error moving between summary and cart pages
 2023-08-09 11:14:52 +10:00
Matt-Yorkley
d1bcdde49f Simplify split checkout errors 2023-08-04 08:43:15 +10:00
Gaetan Craig-Riou
33ef8def08 Update order total after removing a voucher 
We need to do this to make sure when display the payment method
again.
Plus spec
 2023-07-28 14:52:25 +10:00
Gaetan Craig-Riou
f35001dacc Update voucher adjustment and order total when adding a voucher 
This is needed so we can check if payment is needed and display
no payment required when no payment needed
 2023-07-28 14:27:27 +10:00
David Cook
be1a72743a Pending spec: vouchers should not require payment 2023-07-28 14:11:31 +10:00
David Cook
895f534afa Remove unnecessary extra page load 2023-07-28 14:11:19 +10:00
David Cook
cdffeea5cb Merge pull request #10966 from macanudo527/fix_linelength_bundle3 
Fix Layout/LineLength - Bundle 3
 2023-07-20 10:04:24 +10:00
Neal Chambers
728926cc9a Fix Layout/LineLength 2023-07-19 08:39:26 +09:00
Gaetan Craig-Riou
a5b2bc6293 Per review, Refactor VoucherAdjustmentsService 
Change #calculate to #update and clean up internal code
 2023-07-18 15:16:21 +10:00
Gaetan Craig-Riou
a584f9aaec Refactor VoucherAdjustmentsService 
It's more inline with existing coding style
 2023-07-18 14:39:01 +10:00
Jean-Baptiste Bellet
776b9adc72 Display shipping address in summary step, instead of the billing one 
+ update specs accordingly
 2023-07-17 09:37:05 +02:00
Gaetan Craig-Riou
751056ba39 As per review comment, spell out voucher code when entering a voucher 
Plus, update other related spec to be consistent
 2023-07-14 14:47:39 +10:00
Matt-Yorkley
f7912a2240 Fix CSS/layout issues 2023-07-04 13:13:05 +01:00
Matt-Yorkley
672400192f Update use of params 2023-07-04 13:13:05 +01:00
Matt-Yorkley
9b45b71696 Improve feature toggling 2023-07-04 13:13:05 +01:00
Matt-Yorkley
93df70c0a7 Use order total excluding discounts in voucher calculations 2023-06-14 10:19:30 +01:00
Mohamed ABDELLANI
bd0e7cdfc8 remove legacy checkout tests 2023-06-13 14:58:16 +01:00
Maikel Linke
38bd31d0e3 Style Layout/TrailingWhitespace 2023-06-05 10:42:21 +10:00
Konrad
b56b36f617 Merge pull request #10859 from filipefurtad0/change_voucher_default_message_en 
[Vouchers] Updates warning_forfeit_remaining_amount default message
 2023-05-23 08:20:41 +02:00
filipefurtad0
c99829e457 Updates spec to reflect change on en.yml 2023-05-18 12:11:37 +01: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
15eee8175e Add amount to voucher 
Change value to amount to be more consistent
 2023-05-16 16:19:59 +10: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
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
Maikel Linke
9c88c77066 Style empty lines 2023-04-14 16:05:50 +10:00
filipefurtad0
4e92f33b1c DRYes spec; adds pending test for default ToS 2023-04-10 12:08:35 +01:00
Neal Chambers
940f806e5f Fix Rubocop Layout/LineLength 2023-04-04 09:44:15 +09:00
Rachel Arnould
02300d6bb6 Merge pull request #10496 from rioug/10479-split-checkout-fix-user-blocked-at-step1 
[split checkout] Fix bug preventing user from reaching payment step
 2023-03-08 15:44:50 +01:00
Gaetan Craig-Riou
23c4298519 Fix bug when in specific scenario user couldn't proceed to payment step 
When using a "pick up" shipping method, with a user who doesn't have a shipping address it was impossible to proceed to the payment step because shipping address was invalid.

To fix this, we ensure that "ship_address_same_as_billing" parameter is set to true when using a "pick up" shipping method.

use distributor address when shipping method doesn't require a ship address ; in doing this we follow the same logic as the legacy checkout
 2023-03-08 10:49:37 +01:00
Jean-Baptiste Bellet
c34942dbf0 Display special_instructions of order as emphasized text if present 
+ update spec as well
 2023-03-03 11:12:11 +01:00
Jean-Baptiste Bellet
0a3d362282 Still improve error message for Billing address 
```
"Bill" is a person's name, and I don't know his address
```

;)
 2023-02-15 10:07:59 +01:00
Jean-Baptiste Bellet
88607a3dce Improve bill address error message 
"(Street + House number)" instead of "address1"
and "postcode" instead of "zipcode"
 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
a39598d049 Reorder error messages to improve readability 
tbs;
 2023-02-15 09:52:10 +01:00