raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,015 Commits 18 Branches 451 Tags
ce83be4eace32214904a8e6014c19188ed2d001c
Commit Graph

2590 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
7d5726b6c7 Merge pull request #7150 from coopdevs/use-order-balance-object 
Feature-toggle all remaining parts of the app where the order balance is shown
 2021-03-30 15:58:12 +02:00
Matt-Yorkley
e8ddbc0449 Merge pull request #7228 from andrewpbrett/freeze-canceled-orders 
Remove UI for modifying line items on canceled orders
 2021-03-29 15:24:24 +02:00
Maikel
74b06d16b8 Merge pull request #7209 from openfoodfoundation/dependabot/bundler/rubocop-1.12.0 
Bump rubocop from 1.11.0 to 1.12.0
 2021-03-29 10:59:38 +11:00
Andy Brett
563a2758a6 remove UI for modifying line items on canceled orders 2021-03-25 16:52:56 -07:00
Matt-Yorkley
0f5af2d9f1 Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee 
[Adjustments] Payment fee adjustment
 2021-03-25 17:40:53 +01:00
Maikel Linke
ffb4ba5ef5 Style numeric predicate use with Rubocop 2021-03-25 18:07:11 +11:00
Matt-Yorkley
0ab43d23f9 Replace deprecated reloading by passing true to an association 
object.relation(true) -> object.relation.reload
 2021-03-24 17:51:22 +00:00
Matt-Yorkley
8abfd7c3f3 Update Checkout spec 2021-03-23 18:17:50 +00:00
Pau Perez
c7b85a3591 Sum balances in Payments report implementing #+ 
This avoids consumers of `OrderBalance` having to couple with the inner
details of this abstraction, which makes the code more changeable.
 2021-03-23 09:28:40 +01:00
Andy Brett
f784db0127 Merge pull request #7100 from luisramos0/view_spec_in_rails5 
Rails 5-2 - View spec in rails5
 2021-03-22 16:42:56 -07:00
Luis Ramos
c224396e71 Correct helper name needed in this spec 2021-03-22 20:38:14 +00:00
Pau Perez
f494b720f8 Fix spec 2021-03-22 11:45:12 +01:00
Pau Perez
5815d1a4a4 Make #outstanding_balance return an OrderBalance 
This will let us branch by abstraction. All existing calls to
`#outstanding_balance` will go through `OrderBalance` hence, will
check the feature toggle.

Note that by default, `OrderBalance` will end up calling
`#old_outstanding_balance`. As the name states, that's exactly what
`#outstanding_balance` was so far. This means no consumers will see any
change in behavior. We just added on item in the call stack (sort of).
 2021-03-22 11:45:12 +01:00
Maikel
c4370f1583 Merge pull request #7045 from jibees/7008-add-automated-tests-for-unit-price 
add automated tests for unit price in the shopfront
 2021-03-19 11:01:25 +11:00
Matt-Yorkley
479c1ae6e6 Merge pull request #7062 from mkllnk/6327-terms-of-service 
Show Terms of Service at checkout if required
 2021-03-18 19:16:06 +01:00
Jean-Baptiste Bellet
014ffef16c Add tests about unit price inside the cart sidebar 
- Test if the question mark icon is present
 - Click to show the tooltip
 - Another click to hide the tooltip
 2021-03-18 09:40:04 +01:00
Jean-Baptiste Bellet
1be1d161d3 Add tests about unit price inside a shopfront 
- Test that the unit price wrapper is here
 - Click on the question mark icon and display the tooltip
 - Click outside the question mark icon and hide the toolip
 2021-03-18 09:40:04 +01:00
Pau Perez
cf730f8b0c Temporarily skip embedded shopfront flaky spec 
Closes #7129 as discussed on that issue.
 2021-03-17 16:06:48 +01:00
Luis Ramos
c5581fa25f Rename spec/support/CheckoutHelper to resolve colision with app/helpers/CheckoutHelper 2021-03-16 23:20:11 +00:00
Andy Brett
046a2077f2 check the time, not the printed zone, in the spec 2021-03-16 12:14:27 -07:00
Andy Brett
76940a6a2e Merge pull request #7134 from coopdevs/feature-test-payments-report 
Feature-test payments report
 2021-03-16 10:18:36 -07:00
Pau Perez
16647006c6 Feature-test payments report 
This report displays order balances and we'll need this basic
feature-test coverage to ensure it keeps working once we refactor them.
 2021-03-16 17:05:31 +01:00
Andy Brett
b0f2688001 Merge pull request #7128 from jibees/7127-terms-&-conditions-test-fails 
Use timezone as hour and minute offset from UTC in terms_and_conditions_spec.rb
 2021-03-16 08:34:18 -07:00
Matt-Yorkley
e78fb784c6 Merge pull request #7042 from coopdevs/fix-money-object-deprecation-warnings 
Fix money object deprecation warnings
 2021-03-16 14:30:51 +01:00
Jean-Baptiste Bellet
57a65da674 Use timezone as hour and minute offset from UTC 
- e.g. +0900 (and not e.g. +09:00)
 2021-03-16 09:52:45 +01:00
Matt-Yorkley
6bb85e9acd Fix payment and shipment states issue 
For some reason the order objects were stale here when calling order.update! from either a payment or shipment callback, which was overwriting those states as nil on the order.
 2021-03-11 12:23:00 +00:00
Matt-Yorkley
3748d92bc8 Fix modifying taxons in ShopsCaching spec 
This was triggering an error via the callback Spree::Product#remove_previous_primary_taxon_from_taxons
 2021-03-11 12:19:55 +00:00
Matt-Yorkley
791a47d170 Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost 
[Adjustments] Move shipping adjustment from order to shipment
 2021-03-11 12:17:14 +01:00
Maikel Linke
06f46c4e29 Remove unnecessary comments 2021-03-11 11:18:12 +11:00
Pau Pérez Fabregat
e341b04487 Merge pull request #6902 from openfoodfoundation/setup-postgres-gh-actions 
Setup Github Actions as CI
 2021-03-10 16:59:59 +01:00
Pau Pérez Fabregat
66201c6618 Merge pull request #7055 from coopdevs/remove-js-capabilities-to-test 
Remove unnecessary JS-capabilites for test
 2021-03-10 09:53:23 +01:00
Maikel Linke
20f11327b5 Show combined checkbox when all terms required 
The user should need to tick only one box to agree.

We don't remember yet if someone agreed to the platform TOS and
therefore the box is always unticked to start with.

Remembering the agreement is another issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/6328
 2021-03-10 17:09:26 +11:00
Maikel Linke
b266c9df34 Enable checkout button only when terms accepted 
This was working with the seller's terms but now it includes the
platform's terms as well.

Pending:

- Simplify Ansible code
- Unify the two terms checkboxes if both required
 2021-03-10 17:09:26 +11:00
Maikel Linke
2149ce7c94 Reduce run time of specs by combining them 
It's better style to have those specs independent but we also have a
need for fast tests.
 2021-03-10 17:09:26 +11:00
Maikel Linke
561da1f834 Show Terms of Service at checkout if required 
The checkout page shows a checkbox to accept the platform's Terms of
Service. Ticking the box doesn't have any effect yet but at least people
are aware and are presented with a link to the terms.
 2021-03-10 17:09:26 +11:00
Andy Brett
ae3b186bcd remove hardcoded time string in T&C spec 2021-03-09 16:19:27 +01:00
Pau Perez
42c9050a17 Fix cookie retrieval in feature spec 
I also took the chance to reduce some redundant assertions.
 2021-03-09 16:19:27 +01:00
filipefurtad0
f26a7befab removes default value assertions 2021-03-09 15:18:02 +00:00
Pau Perez
c986583d09 Remove unnecessary JS-capabilites for test 
This gets this file execution time from ~10s to ~2s.
 2021-03-09 16:04:29 +01:00
Pau Perez
7792bc34c8 Test that currency symbol position can be changed 2021-03-08 13:40:00 +01:00
filipefurtad0
3b81f51fe4 adds coverage to transacion fees/payment methods 2021-03-08 12:35:35 +00:00
Pau Perez
ca268d5c84 Remove unnecessary indirection in test 2021-03-08 13:34:57 +01:00
Matt-Yorkley
b1bf2487e2 Update adjustment scope use in Xero Invoices report 2021-03-04 14:27:02 +00:00
Matt-Yorkley
434c9f1c7c Fix test setup in adjustments_spec 
The order association is required for these objects to be found
 2021-03-04 14:27:02 +00:00
Matt-Yorkley
0e2c1d0317 Refresh shipment rates when changing shipping method cost 
The test setup here wasn't correctly updating he shipment's shipping_rates, so they were still zero.
 2021-03-04 14:27:02 +00:00
Matt-Yorkley
7fb5bf217f Update checkout spec adjustment fetching 2021-03-04 14:27:02 +00:00
Matt-Yorkley
833aae23e5 Update admin adjustments controller 2021-03-04 14:27:02 +00:00
Pau Pérez Fabregat
094ef28456 Merge pull request #6996 from filipefurtad0/payment_method_spec 
fixes a pending test case for hubs w/ several distributors
 2021-03-03 16:48:10 +01:00
filipefurtad0
1c018bdd90 fixes a pending test case for hubs w/ several distributors 2021-03-03 08:59:56 +00:00
Pau Perez
45d0501ca6 Fix old pending locale-related spec 
This is the correct behavior: if you set a language that is not
available, it'll fallback to English.
 2021-03-02 11:42:45 +01:00