Pau Pérez Fabregat
0f78b5b315
Merge pull request #7616 from jibees/7602-unit-price-not-displaying-when-comma-is-the-decimal-separator
...
Backoffice: Unit price not displaying when comma is the decimal separator
2021-05-27 17:45:19 +02:00
Pau Pérez Fabregat
0d5f76b19e
Merge pull request #7621 from jibees/7534-upload-logo-and-promo-image-for-enterprise
...
Upload enterprise image (logo and promo): force content type to "text/plain"
2021-05-27 11:33:56 +02:00
Pau Pérez Fabregat
bfa77baae1
Merge pull request #7542 from jibees/6359-add-payment-method-description-to-invoice
...
Add payment method description to invoice
2021-05-27 11:01:07 +02:00
Jean-Baptiste Bellet
6842cbfda4
Force content type to "text/html"
...
- Force the content type to be `text/html` (instead of `application/json`)
2021-05-25 15:30:21 +02:00
Matt-Yorkley
ecb4cb31ad
Merge pull request #7599 from Matt-Yorkley/cart-rendering
...
Move line item rendering to a collection in cart page
2021-05-25 13:37:50 +02:00
Jean-Baptiste Bellet
dd47430f19
Improve unlocalizeCurrency filter to handle many cases
...
- Complete the unit test to handle all these cases.
2021-05-25 13:14:53 +02:00
Matt-Yorkley
74f27544f7
Merge pull request #7647 from andrewpbrett/default-country-codes
...
Use correct default country code
2021-05-25 11:21:34 +02:00
Matt-Yorkley
5868765087
Merge pull request #7673 from Matt-Yorkley/spree-config-caching
...
Fix clashing loggers
2021-05-25 11:09:33 +02:00
Andy Brett
b367001b95
Merge pull request #7641 from luisramos0/order_path
...
[Rails 6.1] Fix view specs
2021-05-24 14:41:32 -07:00
Andy Brett
46843a5efa
Merge pull request #7662 from Matt-Yorkley/enterprise-rendering
...
Render enterprise rows as a collection
2021-05-24 09:37:58 -07:00
Jean-Baptiste Bellet
d066f0b94d
Enable displayable unit price for price with comma as decimal separator
...
Retrieve the current decimal separator used to display price (`I18n.toCurrency()`), and check if number is formatted with only if this is `,`. If so, remplace comma by point, to pass the check `!isNaN`, and format unit price
2021-05-24 10:55:05 +02:00
Matt-Yorkley
3dc3581e6b
Ensure Mail configs are applied when the app starts
...
Previously we only set these part-way through deployment, so the values could be out of sync between our ENV vars and Spree::Config (which itself is a mix of both cached values and database-persisted values).
2021-05-23 23:05:16 +01:00
Pau Pérez Fabregat
8c81c14c8d
Merge pull request #7580 from apricot12/Remove-LineItems-N+1
...
Removed N+1 queries while counting line_items
2021-05-20 11:42:14 +02:00
Andy Brett
70ac719725
Merge pull request #7649 from andrewpbrett/payments-when-out-of-stock
...
Check stock before doing anything related to admin payments
2021-05-19 14:45:38 -07:00
Luis Ramos
a1ac4e85ed
Replace update_attributes with update
2021-05-19 09:54:25 -07:00
Luis Ramos
341f6c9f62
Now that adjustment.update! has been renamed to adjustment.update_adjustment! we can use AR's update! on adjustment
2021-05-19 09:54:25 -07:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Andy Brett
e73584fef7
remove setters from DefaultCountry service
2021-05-19 09:42:52 -07:00
Jean-Baptiste Bellet
7ab065e8cd
Add section at the bottom of invoice: Payment Description at Checkout
...
- If there is any payments, we use the last one to retrieve the payment method description
Use the first completed payment to display payment description
Completed is state = "checkout" or state = "completed"
Squash w/ "Add section at the bottom of invoice: Payment Description at Checkout"
Squash w "Add section at the bottom of invoice: Payment Description a"
2021-05-19 11:55:38 +02:00
Jean-Baptiste Bellet
aea0670268
Add method payment_method to get the payment method from a payment
...
- Method `payment_method_name` now use `payment_method`
2021-05-19 11:55:38 +02:00
Matt-Yorkley
0c4e191f3b
Render enterprise rows as a collection
...
Note: this is a bit like an N+1 query, but for rendering. If there are 30 enterprises, the partial file would be loaded and parsed 30 times; but if we render it as a collection it'll load the partial once and substantially improve the performance.
2021-05-19 08:48:25 +01:00
Andy Brett
4b352da402
Merge pull request #7630 from apricot12/persistent_flash_after_reload
...
Persistent flash after reload
2021-05-18 12:55:37 -07:00
Andy Brett
7df2915fbd
add DefaultCountry service
2021-05-18 12:44:53 -07:00
Andy Brett
5169ee91ea
add comment for before_action
2021-05-18 10:42:19 -07:00
Andy Brett
5917accdd2
refactor using Extract Method
2021-05-18 10:38:35 -07:00
Matt-Yorkley
5dd24623f7
Merge pull request #7479 from Matt-Yorkley/payment-callbacks
...
Update Payment after_save callback
2021-05-18 16:19:29 +02:00
Pau Pérez Fabregat
5f9679655c
Merge pull request #7645 from Matt-Yorkley/stripe-payment-processing
...
Stripe payment processing
2021-05-17 16:17:21 +02:00
Matt-Yorkley
794216713a
Ensure payment is processed if order is in completed state
2021-05-16 23:03:07 +01:00
Matt-Yorkley
a2862e604c
Find relevant payment that matches the payment intent, not the last payment
2021-05-16 23:00:31 +01:00
Matt-Yorkley
8429da3d2a
Remove unused argument from ProcessPaymentIntent
2021-05-16 22:19:01 +01:00
Matt-Yorkley
2e63cd8116
Add explanatory comment on payment processing flow
2021-05-16 20:11:45 +01:00
Matt-Yorkley
52e0d84238
Reload in-memory payment before checking it's new state
...
The state should have changed in the database if the payment was processed successfully, and the memoized version here will not know that without a reload.
2021-05-16 20:11:45 +01:00
Matt-Yorkley
5725535715
Fix payment state checking
2021-05-16 20:11:45 +01:00
Matt-Yorkley
fd021d4778
Refactor payment intent status checking and return "ok" if the payment has already been processed successfully in a previous request
...
If the page is reloaded after the payment has already gone through, we can skip the processing and give a non-error response; the payment is already completed and Stripe's response confirms it was successful.
2021-05-16 20:11:45 +01:00
Matt-Yorkley
2b9f9fce86
Fix flash session memory-effect when showing errors after payment processing
...
We're not doing a redirect after setting this flash message, so we need to ensure it's discarded after the current page load.
2021-05-16 20:11:45 +01:00
Matt-Yorkley
81aac442f2
Improve conditional in raise_if_not_in_capture_state
2021-05-16 20:11:45 +01:00
Matt-Yorkley
5805104d13
Tidy up controller and add explanatory comment
2021-05-16 12:19:04 +01:00
Matt-Yorkley
e686a4f627
Move raising of errors when payment intent state != "requires_capture" out of PaymentIntentValidator service
...
When we're fetching the payment intent via PaymentIntentValidator in StripeSCA#purhcase (to capture it), we want it to fail loudly if it's not in "requires_capture" state. We're now also re-using the same PaymentIntentValidator service to check if payment processing was *successful*, in which case we need it *not* to fail loudly if the state == "succeeded", eg != "requires_capture".
2021-05-16 12:19:04 +01:00
Andy Brett
c7f80d86a8
Merge pull request #7638 from Matt-Yorkley/dead-code-order-distribution
...
Delete dead code in OrdersController#update_distribution
2021-05-15 12:40:25 -07:00
Andy Brett
f2c3b096a0
Merge pull request #7566 from luisramos0/erb
...
[Rails 6.0] Fix problem in erb template by explicitly setting format to js
2021-05-15 10:45:01 -07:00
Andy Brett
0a880a2bf3
flip conditional order for performance
2021-05-15 07:08:07 -07:00
Andy Brett
ca38948e21
check stock before doing anything related to admin payments
2021-05-14 17:42:37 -07:00
Luis Ramos
90db52e5f5
Fix route
2021-05-14 00:14:02 +01:00
Luis Ramos
b1896733ca
Fix routes
2021-05-14 00:08:20 +01:00
Luis Ramos
0243e5cbb8
Fix route in order view
2021-05-13 23:08:50 +01:00
Matt-Yorkley
2e248744c0
Merge pull request #7520 from Matt-Yorkley/shipment-controller
...
Shipment controller: test coverage and improvements
2021-05-13 20:26:51 +02:00
Matt-Yorkley
82a6befce7
Delete dead code in OrdersController#update_distribution
...
I can't see any evidence that these params ever get sent to this action...
2021-05-13 15:29:53 +01:00
Nihal Mohammed
c930b2ee60
Fix persistet flash after /cart page reload
2021-05-13 05:57:25 +05:30
Nihal Mohammed
367cee593f
Move eager loading line_items to controller
2021-05-13 01:12:13 +05:30
Matt-Yorkley
99cf23df26
Merge pull request #7530 from Matt-Yorkley/email-after-commit
...
Email after commit
2021-05-12 21:22:55 +02:00
