raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-14 04:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 16 Branches 456 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

9098 Commits

Author SHA1 Message Date
filipefurtad0
9bf0667d04 Moves failed response stub into registered user context 2022-02-24 16:27:03 +00:00
Maikel Linke
8ffe6f6052 Sanitise user_id param on enterprise update 2022-02-24 14:51:23 +11:00
Maikel Linke
8e070f55ff Spec fail on bad enterprise param 
It looks like some JS component can submit an invalid value here and it
causes a server error.
 2022-02-24 14:46:42 +11:00
Filipe
385cd49964 Merge pull request #8876 from SarvarKh/product-import-validation 
Fix product import on existing, empty unit_type and variant_unit
 2022-02-21 23:20:04 +00:00
Filipe
dbf5eb76f8 Merge pull request #8689 from apricot12/Transaction_fee_when_crediting 
Revoke transaction fee if there is an amount to be credited in order
 2022-02-21 20:30:19 +00:00
Filipe
89dc9b938b Merge pull request #8864 from jibees/7934-display-tax-rate-for-shipping-on-invoice 
Display tax rate for shipping in alternative invoice model
 2022-02-21 20:02:44 +00:00
Filipe
7590b3ecf8 Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute 
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
 2022-02-21 19:04:08 +00:00
Filipe
9966b5b33c Merge pull request #8565 from jibees/8171-group-by-imperial-unit 
Handle imperial units in the Bulk Order Management interface
 2022-02-21 14:47:38 +00:00
Matt-Yorkley
3effff8821 Show resent confirmation message in current tab 2022-02-18 09:42:49 +00:00
filipefurtad0
1113aefe11 Adds login modal test case from #8861 2022-02-17 13:19:32 +00:00
Matt-Yorkley
6c695df917 Merge pull request #8895 from Matt-Yorkley/cloned-subscription-syncing 
Sync subscriptions on newly-cloned order cycles
 2022-02-17 12:44:39 +00:00
Matt-Yorkley
9a27addd14 Merge pull request #8763 from openfoodfoundation/8577-split-name-column-in-customers-table 
Split name column in customers table
 2022-02-17 11:57:01 +00:00
Filipe
a6c5d8ca73 Merge pull request #8673 from filipefurtad0/split_checkout_auth_spec 
Adds split-checkout toggling lines
 2022-02-17 11:10:44 +00:00
Filipe
4dbf047647 Merge pull request #8871 from jibees/8827-preselect-shipping-method 
SplitCheckout: preselect the shipping/payment method if the only one available
 2022-02-17 10:54:20 +00:00
Jean-Baptiste Bellet
716286497e Add test to cover "preselect the shipping method" if only one is available 
+ do not preselect if more than one are available
 2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet
0e053a2601 Add test to cover "preselect the payment method" if only one is available 
+ do not preselect if more than one
 2022-02-17 09:33:23 +01:00
Matt-Yorkley
00fa84e3b5 Sync when switching from nil dates to open 2022-02-16 21:45:43 +00:00
Matt-Yorkley
5913720c85 Sync for both open and upcoming OCs when switching from closed 2022-02-16 18:33:09 +00:00
SarvarKhalimov
22de758e3a Add spec for product import validation 2022-02-16 14:17:35 +05:00
Maikel Linke
33969de371 Allow shared_examples to have more than 25 lines 2022-02-16 11:41:28 +11:00
Maikel Linke
a6dee77071 Style 2022-02-16 10:33:49 +11:00
filipefurtad0
78946f908a Adds shared examples; sets conditional filters on test cases 2022-02-15 23:23:31 +00:00
Matt-Yorkley
4c50ca69ea Improve data migration logic and add test coverage 2022-02-16 10:23:24 +11:00
Matt-Yorkley
fd815a6af6 Don't change Customer factory name generating logic 2022-02-16 10:23:24 +11:00
Maikel Linke
d09ba16411 Associate customers again 
And simplify the before_validation actions.
 2022-02-16 10:23:23 +11:00
Maikel Linke
07314af3f6 Spec customer record association more realistically 
The newly added specs were tested on the master branch and passed. But
the previous commit broke one test case which I marked as pending here.

The removed specs are completely replaced by the new ones. Their main
downside was to test only small bits of internal behaviour without
considering the whole callback chain of the order. The new specs are
more realistic and catch bugs like mentioned above.
 2022-02-16 10:23:23 +11:00
François Turbelin
554a8625e5 Refactor ensure_customer method 2022-02-16 10:23:23 +11:00
François Turbelin
23776c7a3e Fix more specs 2022-02-16 10:23:23 +11:00
François Turbelin
75345a95af Update customer factory 2022-02-16 10:23:22 +11:00
Adrien Chauve
ca46359224 More fixes 2022-02-16 10:23:22 +11:00
Adrien Chauve
9b93102a96 More fixes 2022-02-16 10:23:22 +11:00
Adrien Chauve
ba6523bb76 Add Customer.full_name 2022-02-16 10:23:22 +11:00
Jean-Baptiste Bellet
405b7e6e17 Handle tax rates for ShippingMethod 
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-02-15 15:16:58 +01:00
Matt-Yorkley
711a51f2ff Remove .eligible scope 
In this case we actually expect there to be no payment fee adjustments at all on the payment, regardless of their eligibility.
 2022-02-15 12:24:28 +00:00
Matt-Yorkley
5fba7811c4 Remove #try 
#try is useful when the object might be nil or might not respond to the given method. In this case we expect it to exist and respond to #finalized?, so this is a bit more precise.
 2022-02-15 12:21:34 +00:00
Matt-Yorkley
5be1b139b9 Replace .stub with expect(x).to receive(:y) 
The #stub method is slightly deprecated syntax. Using #expect has the additional benefit here of failing if the object does not receive the expected method call.
 2022-02-15 12:19:15 +00:00
Nihal M. Kelanthodika
b017420319 Add specs to check ensure payment method fee is not applied when crediting/refunding order 2022-02-15 11:52:26 +00:00
Filipe
a9d7fa473e Merge pull request #8870 from jibees/8853-handle-back-button-on-summary-page-for-the-split-checkout 
Split checkout: handle the link for "Back to Payment method" button in the summary page
 2022-02-14 18:29:11 +00:00
Matt-Yorkley
e5818955ff Invalidate all incomplete payments when creating a new one, not just those in "checkout" state. 
Looking at prod data; when a checkout submission fails due to something like a card being out of date, the payment's state seems to be "pending" and not "checkout", which means this mechanism fro invalidating old payments is potentially not working where it should.
 2022-02-11 17:25:27 +00:00
Jean-Baptiste Bellet
43cd604405 Update to the right link the "Back to Payment method" button 
+ create a spec as well
 2022-02-11 15:01:53 +01:00
Cillian O'Ruanaidh
1b8c1bd27a Only initialise Stimulus app once in Jest tests in :beforeAll rather than :beforeEach 
Before there was an issue with the remote_toggle_controller tests, which contains two tests. If you commented out one test and ran the other it would pass and vice versa but if both tests were uncommented only the first test would ever pass, the second one would fail. See https://github.com/openfoodfoundation/openfoodnetwork/pull/8805#discussion_r801464322

Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-02-11 10:21:26 +00:00
Filipe
820417e6cc Merge pull request #8828 from apricot12/8794-Keep_schedule_when_cloning_OC 
Carry over linked schedule to cloned Order Cycle
 2022-02-10 17:09:56 +00:00
Jean-Baptiste Bellet
af8500e98c Add the test around the cancellation email sending or not 2022-02-10 14:39:00 +01:00
Jean-Baptiste Bellet
a99ecc473d Add tests around item deletion for an order 2022-02-10 14:39:00 +01:00
Maikel
fb920c8960 Merge pull request #8845 from mkllnk/swagger-cleanup 
Add rspec tools for better integration of the coming API v1
 2022-02-10 10:04:03 +11:00
Filipe
30c1d89525 Merge pull request #8822 from Matt-Yorkley/split-checkout-payment-total 
[Split Checkout] Move setting of payment total during checkout into OrderUpdater
 2022-02-09 16:21:47 +00:00
Maikel Linke
8f5cb7bd91 Update swagger files, separate v0 and v1, delete old file 
The new v1 doesn't contain any API endpoints yet. We will add them later
when they are ready.
 2022-02-08 11:44:36 +11:00
Matt-Yorkley
9d67606490 Generate rswag routes and helper 2022-02-08 11:43:49 +11:00
Jean-Baptiste Bellet
dfe8ed26d9 Update tests and use ransack to search with the new scope: with_properties 2022-02-07 08:57:18 +01:00
Maikel Linke
572a65b324 Create a scope to retrieve product based on its properties 
both inherited and own product properties

Update the product spec to test the scope that concern properties
 2022-02-07 08:57:18 +01:00