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
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
Maikel Linke
6468b7d98d
Spec image upload
...
The use of AWS S3 was untested before and it failed after upgrading to
Ruby 3.
2022-02-03 11:25:16 +11:00
Nihal M. Kelanthodika
b45f0f3416
Update order_cycle model spec to account for cloning of schedule along with OC
2022-02-02 21:21:38 +05:30
Matt-Yorkley
f77ecc1968
Improve and simplify return authorizations test setup
2022-02-01 11:39:07 +00:00
Matt-Yorkley
35392cb117
Remove Order#set_payment_amount!
2022-02-01 11:39:07 +00:00
Matt-Yorkley
31e6405125
Handle setting of payment amount during checkout in OrderUpdater
2022-02-01 11:39:07 +00:00
Filipe
ca0166a420
Merge pull request #8807 from Matt-Yorkley/closed-oc-payment-auth
...
Fix Stripe payment authorizing for closed order cycles
2022-02-01 11:16:31 +00:00
Filipe
998f7afdc4
Merge pull request #8523 from seballot/progress-for-ajax-request
...
Improve loading spinner display
2022-02-01 10:03:04 +00:00
Filipe
8d18279f53
Merge pull request #8784 from apricot12/7398-Weight_field-on-non-weight-variants
...
Convert variant.weight into decimal if integer or 0.0 if nil
2022-01-31 18:55:31 +00:00
Matt-Yorkley
81f5755e3d
Add tests for tabs_controller
2022-01-31 16:34:35 +00:00
Filipe
4e4d9bb5a5
Merge pull request #8804 from Matt-Yorkley/split-checkout-fees
...
[Split Checkout] Ensure fees are applied during checkout update
2022-01-31 16:26:22 +00:00
Matt-Yorkley
11ed1574ca
Call #check_order_cycle_expiry in PaypalController and StripeController, but avoid it on #authorize action
...
The authorize action is used for authorizing off-session payments where the order is *already complete* and the order cycle may have closed (backoffice and subscriptions). They are essentially asynchronous and not coupled to the current open/closed state of the order cycle.
2022-01-31 15:55:35 +00:00
Matt-Yorkley
5e6dd1e6e1
Move #check_order_cycle_expiry method to OrderStockCheck and don't call it from BaseController :before_action callback
2022-01-31 15:55:35 +00:00
Nihal M. Kelanthodika
ddaac654ef
Add specs for conversion of variant weight input into decimal/0.0
2022-01-31 17:43:15 +05:30
Matt-Yorkley
0516ec6f15
Enable test for loading address (now passing)
2022-01-30 11:33:31 +00:00
Matt-Yorkley
7e62bfcdfb
Add failing test for loading address with state correctly in split checkout
2022-01-30 11:33:31 +00:00
Matt-Yorkley
f4fdc8740e
Disable test that depends on missing Transifex keys
2022-01-29 20:06:46 +00:00
Matt-Yorkley
8b59ef20db
Improve controller tests
2022-01-29 14:49:23 +00:00
Matt-Yorkley
13a7fb79cf
Move more login handling out of Angular
2022-01-29 14:49:23 +00:00
Matt-Yorkley
6116fd8881
Improve inaccurate specs
2022-01-29 14:49:23 +00:00
Matt-Yorkley
0577b46f3f
Create simpler non-Angular login modal
2022-01-29 14:49:23 +00:00
Matt-Yorkley
8a18a4de66
Clear up redirecting logic and path building
2022-01-29 10:08:51 +00:00
Matt-Yorkley
6c6e5ca316
Ensure fees are applied during checkout
2022-01-28 11:38:23 +00:00
Matt-Yorkley
0bec693655
Merge pull request #8791 from Matt-Yorkley/split-checkout-terms
...
[Split Checkout] Update terms of service handling
2022-01-27 13:07:04 +00:00
Matt-Yorkley
1ee3d0f7a1
Drop embedded shops code
2022-01-26 19:58:39 +00:00
Filipe
75395f6f29
Merge pull request #8648 from Matt-Yorkley/csp
...
Configure CSP
2022-01-26 19:55:11 +00:00
Filipe
374c05116b
Merge pull request #8726 from Matt-Yorkley/stringex-machina
...
Reduce impact of stringex gem
2022-01-26 19:02:41 +00:00
Filipe
62457f0c69
Merge pull request #8778 from georgethoppil/master
...
Adding deleted_at check on variant_stock move
2022-01-26 17:33:29 +00:00
Filipe
404fb4cb7f
Merge pull request #8771 from tsara27/8458-missing-translation
...
Missing translation: table headers in product import validation table #8458
2022-01-26 17:22:44 +00:00
Filipe
53b96896a9
Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
...
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +00:00
Filipe
733d788215
Merge pull request #8758 from Matt-Yorkley/split-checkout-payments
...
Split checkout: external payment processing
2022-01-25 15:55:56 +00:00
Matt-Yorkley
bfe70691c2
Add test coverage for accepting terms of service
2022-01-25 15:19:32 +00:00
Matt-Yorkley
31349ed3ae
Remove example system spec
2022-01-25 13:45:15 +00:00
Maikel Linke
828e3ab08d
Wait for JS in spec for consistent pass
2022-01-25 14:12:50 +11:00
Matt-Yorkley
b5a1d9ebef
Allow using saved cards at checkout
2022-01-24 23:06:43 +00:00
George Thoppil
77e5aab6c8
Merge branch 'openfoodfoundation:master' into master
2022-01-24 16:48:21 -05:00
Matt-Yorkley
8c9ca3b0c3
Extract method and allow Stripe payment completion on orders in confirmation state
2022-01-24 20:49:06 +00:00
Matt-Yorkley
8552da2377
Extract and stub PaymentMethodFetcher
2022-01-24 20:28:59 +00:00
Matt-Yorkley
ebb69d7f93
Add controller test for payment redirect
2022-01-24 20:28:59 +00:00
GeorgeThoppil
b2e9106654
Linting/Trailing whitespace
2022-01-24 09:30:55 -05:00
Matt-Yorkley
48a7cfa09e
Fix more deprecated keyword arguments
2022-01-24 14:11:08 +00:00
George Thoppil
745758b7de
Update spec/models/spree/order_spec.rb
...
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com >
2022-01-24 09:06:09 -05:00
Filipe
1120e4e460
Merge pull request #8759 from jibees/8547-use-the-last-payment-in-the-Payment-Method-Report
...
Use the last payment method instead of the first for the Payment Method Report
2022-01-24 12:51:08 +00:00
