jibees
eeae67e2d0
Merge pull request #8935 from mkllnk/clean-rubocop
...
Relax our style guide
2022-02-28 15:16:46 +01:00
filipefurtad0
f6304892c2
Adds controller coverage for stock restrictions
2022-02-27 22:01:48 +00:00
Maikel Linke
e6b4f462ef
Revert "Add rubocop config to allow specs to be 300 lines long"
...
This reverts commit 0b51d8b297 .
I think that this config was complicated in the setup and potentially
confusing to have different rules in different places.
It's better to fix those spec files by either making them smaller or
removing the `module` block in the spec. We can reference the modules
explicitely where needed.
2022-02-25 12:05:04 +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
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
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
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
Jean-Baptiste Bellet
f8002ae49a
Add some controller specs that handle the supplier_property filtering
...
with product that don't inherits properties
2022-02-07 08:57:18 +01:00
Jean-Baptiste Bellet
242459fae4
Create the test that actually failed and should not
2022-02-07 08:57:18 +01:00
Filipe
e403fc171d
Merge pull request #8808 from Matt-Yorkley/login-modal
...
Remove all Angular code from Login/Signup process
2022-02-03 19:36:44 +00:00
Filipe
c4751d7056
Merge pull request #8813 from Matt-Yorkley/split-checkout-address-state
...
Split checkout: fix loading of saved addresses
2022-02-03 19:06:35 +00:00
Maikel Linke
2e6d8c1216
Provide aws-sdk with working URI.encode method
...
The S3 class is calling URI.encode which is removed in Ruby 3. By
providing a URI module within the S3 class makes the S3 code call that
module instead.
2022-02-03 15:20:51 +11:00