Matt-Yorkley
23910dbab4
Use OrderContents in BulkLineItemsController
...
We should move towards *all* operations on an order's line items being done exclusively through this service.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
632f4228f0
Bring in line item fetching refactor
2021-06-04 17:10:50 +01:00
Matt-Yorkley
1268cb565c
Extract method
2021-06-04 17:10:50 +01:00
Matt-Yorkley
c55e47f6af
Remove superfluous updates in OrderFeesHandler
2021-06-04 17:10:50 +01:00
Matt-Yorkley
03fc63ad14
Remove #order_update! from line item after_save callback
2021-06-04 17:10:50 +01:00
Matt-Yorkley
a124141537
Move Shipment#line_items to private
2021-06-04 17:10:50 +01:00
Matt-Yorkley
0fabb5bc2f
Don't pluck variant_ids multiple times (once for each line item)
2021-06-04 17:10:50 +01:00
Matt-Yorkley
1fff81c214
Remove call to OrderInventory#verify
...
This already gets called in after_save and after_destroy in Spree::LineItem.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
67264c047f
Delete dead code #editable_by?
...
This is junk Spree code from 2010. 11 years old! The method that previous called this was removed long ago...
2021-06-04 17:10:50 +01:00
Matt-Yorkley
34eaf6f0f2
DRY shipment updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
8405a7672d
Bring in shipment updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
66a3246a23
Move order updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
34482f6710
Bring OrderContents#update_cart from Spree 2.2
2021-06-04 17:10:50 +01:00
Matt-Yorkley
f550d1e9f3
Bring Order#ensure_updated_shipments from Spree 2.2
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d99e598e7a
Delete dead code in CartController
...
The two conditionals in #populate_variant_attributes here are never actually true, so the subsequent code paths are never reached.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
eb59b691d8
Move hash parsing outside of order lock
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5d76d9b9a
Move private controller methods to private
2021-06-04 17:10:50 +01:00
Andy Brett
d197b81351
Merge pull request #7606 from luisramos0/deprecation
...
[Rails 6.1] Fix deprecation warning in rails 6.0
2021-06-04 07:42:50 -07:00
Andy Brett
f70c1f0644
Merge pull request #7611 from luisramos0/rails61_arel
...
[Rails 6.1] Adapt code to circunvent security constraint on rails 6.1
2021-06-04 07:36:23 -07:00
Andy Brett
b23530be4c
Merge pull request #7736 from Matt-Yorkley/ssl-in-dev
...
Remove Spree::Config[:allow_ssl_in_development_and_test]
2021-06-04 07:21:05 -07:00
Maikel
4dacdb180f
Merge pull request #7617 from luisramos0/layout61
...
[Rails 6.1] Make admin layout path relative
2021-06-04 12:26:40 +10:00
Matt-Yorkley
7d38bec26d
Remove Spree::Config[:allow_ssl_in_development_and_test]
...
Unconditionally disables forced https-redirects in dev and test
2021-06-03 20:52:09 +01:00
Luis Ramos
4252bd0bb1
For some reason report helper is not available on this view now, so we call Spree::Money directly
2021-06-01 22:34:04 +01:00
Matt-Yorkley
834140f0a2
Don't dump massive binary PDF data into the job queue
...
Here we were rendering an entire PDF, then passing that PDF into the job queue as an *argument* containing the entire binary of the PDF in a massive string. This means the job object itself would contain that entire PDF. That's bad queueing!
We now create the PDF *during* the job (not before it), and pass simple arguments.
2021-05-29 16:06:29 +01:00
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
