Maikel Linke
3b3ba70670
Safeguard deletion of ToS with alert
2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd
Add delete method to terms of service files
2021-06-09 14:06:54 +10:00
Maikel Linke
3bee9cb951
Add Rails action #new to ToS
2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f
Add upload of Terms of Service files
...
Admins can upload files and view the most recent (current) one.
2021-06-09 14:06:54 +10:00
Maikel Linke
ed4f61acd7
Add title to TOS config page
2021-06-09 14:06:53 +10:00
Maikel Linke
007b8cd888
Add new admin page for TOS files
...
Just the basic Rails setup without any functionality yet.
2021-06-09 14:06:53 +10:00
Maikel Linke
9027f8b604
Add attachment to TOS record
2021-06-09 14:06:53 +10:00
Maikel Linke
c4317c5707
Add model TermsOfServiceFile
...
We want to enable instance managers to upload TOS files.
I also added the rails_helper which is a new convention. It can contain
more Rails specific configuration we currently have in the spec_helper.
2021-06-09 14:06:09 +10:00
Andy Brett
b6f6407c31
Merge pull request #7660 from jibees/7499-remove-feature-toggle-for-unit-price
...
Remove feature toggle around unit_price
2021-06-08 10:39:32 -07:00
Andy Brett
fe62a0a2a7
Merge pull request #7697 from jibees/7689-trigger-a-change-when-hour/minute-inputs-are-modified
...
Datetimepicker for order cycles: add keyup event listener on hour/minute inputs
2021-06-08 10:32:07 -07:00
Andy Brett
ede966f2d1
Merge pull request #7640 from apricot12/closed_OC_bheaviour
...
Checkout made to redirect to shop front when OC closed
2021-06-08 10:30:13 -07:00
Andy Brett
74d93e324c
Merge pull request #7661 from romale/products_import_date_translation
...
Missed import_date translation key
2021-06-08 10:26:13 -07:00
Nihal Mohammed
3b4baab01a
Remove unused _paypal_complete partial
2021-06-08 16:31:26 +05:30
Matt-Yorkley
9921e9c72b
Merge pull request #7754 from Matt-Yorkley/stripe-issues
...
Stripe 3DS issues
2021-06-08 11:33:54 +02:00
Nihal Mohammed
4476d7f69e
Disable credit button on click
2021-06-08 14:41:25 +05:30
Jean-Baptiste Bellet
6cf0c73453
Use our unlocalizeCurrencyFilter to parse unit value field
...
- More tolerant (can handle `,` or `.` as decimal separator, remove thousands separator) to return a `number`
2021-06-08 10:55:43 +02:00
Jean-Baptiste Bellet
d3c2158121
Handle comma as decimal separator in the unit value field
...
- Add comma as a decimal separator in the regexp
- Do not use parseFloat but our `unlocalizeCurrencyFilter` which is more tolerant
2021-06-08 09:51:30 +02:00
Jean-Baptiste Bellet
0cb2739139
Handle case when price is not a number
...
And return a `null` if so.
2021-06-08 09:46:24 +02:00
Matt-Yorkley
15b386bce3
Set :execute_threed option to explicitly handle 3DS responses
2021-06-07 22:48:54 +01:00
Matt-Yorkley
3544b7de7a
Remove Stripe Decorator
...
The method being overridden here is the same in the upstream
2021-06-07 20:44:58 +01:00
Jean-Baptiste Bellet
e3f56556cf
Remove feature toggle around unit_price and enable it
2021-06-07 20:53:45 +02:00
Matt-Yorkley
8e0a84a502
Merge pull request #7729 from Matt-Yorkley/delayed-cleanup
...
Delayed::Cleanup
2021-06-07 19:11:37 +02:00
Jean-Baptiste Bellet
3ebba9502a
Handle more cases with decimal/thousands separator
...
- ',' or '.' can be used as decimal separator (defined in the application configuration)
- Remove thousands separator if it's detected as so (use regexp to match)
2021-06-07 16:53:20 +02:00
Nihal Mohammed
a5190ec5d7
Remove refund button from paypal completed order tab
2021-06-07 16:07:31 +05:30
Matt-Yorkley
9e1d8ab369
Introduce legacy tax handing in Order::Updater whenever order totals change
...
This will remove legacy tax adjustments, recalculate any relevant taxes for items in the order and re-apply them in non-legacy tax adjustments
2021-06-06 20:20:41 +01:00
Matt-Yorkley
bfea47802e
Move fee tax call outside of lock and simplify order updating
2021-06-06 20:18:05 +01:00
Matt-Yorkley
28ebb303af
Simplify order interface
2021-06-06 20:17:03 +01:00
Matt-Yorkley
38811b5a28
Add Bugsnag message if legacy taxes are used
2021-06-06 20:17:03 +01:00
Matt-Yorkley
c84f9e56fb
Tax enterprise fee adjustments when calling #recreate_all_fees!
2021-06-06 20:17:03 +01:00
Matt-Yorkley
0f5c39317a
Re-apply taxes in Admin::OrdersController#update
...
Ensures taxes are updated properly when hitting the "Update and Recalculate Fees" button on the order edit page.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
a31487a86d
Clear any legacy taxes when applying tax to an order
...
#create_tax_charge! adds tax (adjustments) to all taxable items on an order. If an order order has legacy taxes (lump-sum tax adjustments on the order object), we remove them here before re-applying taxes (using the new setup).
2021-06-06 20:16:03 +01:00
Matt-Yorkley
84a40e6ae0
Improve Order#enterpise_fee_tax
2021-06-06 20:16:03 +01:00
Matt-Yorkley
510f74f654
Update OrderTaxAdjustmentsFetcher
...
Taxes on Enterprise Fees are now recorded in proper tax adjustments, so they don't need special treatment.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
52452f7939
Update default tax calculator
...
Line items, shipments and fees can now all be calculated in the same way when applying tax.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
2de442f44d
Move taxing of enterprise fees to TaxRate
2021-06-06 20:16:03 +01:00
Matt-Yorkley
a22cc96ea5
Simplify DefaultTax calculator
...
This logic is handled in TaxRate and doesn't need to be duplicated here.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
d450aff607
Update Order#create_tax_charge!
...
TaxRate#adjust now handles individual items instead of the whole order 🎉 We can use this elsewhere too, for example to re-apply taxes on a single line item, we can do: Spree::TaxRate.adjust(order, [line_item])
2021-06-06 20:16:03 +01:00
Matt-Yorkley
f92c082df8
Refactor tax adjustment create_label method
2021-06-06 20:16:03 +01:00
Matt-Yorkley
d69f714032
Bring in changes to TaxRate#adjust
2021-06-06 20:16:03 +01:00
Matt-Yorkley
50d0952dd5
Bring in TaxRate#potentially_applicable method and add eager-loading
2021-06-06 20:16:03 +01:00
Luis Ramos
5629dfbe09
Fix warning: deprecated Object#=~ is called
2021-06-04 22:42:27 +01:00
Luis Ramos
c22799bda1
Replace gsub! with gsub so that strings are not modified
2021-06-04 22:42:22 +01:00
Guido Oliveira
65b760b119
Add validations to variant_override model
2021-06-04 14:11:22 -03:00
Matt-Yorkley
3222d4980d
Improve comment on #ensure_updated_shipments
2021-06-04 17:10:50 +01:00
Matt-Yorkley
e246eed99d
Move #restart_chceckout_flow out of Order class
2021-06-04 17:10:50 +01:00
Matt-Yorkley
b69d61dd77
Remove #order_update! call from method used in order after_save callbacks
...
This method gets called twice every time we save a completed order, calling order_update! twice...
2021-06-04 17:10:50 +01:00
Matt-Yorkley
2d76c2730a
Update shipment updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
2e96982e60
Refactor conditional
...
CartService#populate already returns the value of the #valid? method by default.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
6abe0b375c
Refactor stock levels check in CartController
2021-06-04 17:10:50 +01:00
Matt-Yorkley
dc6be6f06b
Don't resubmit the whole cart contents for no reason.
...
There's a couple of places where this was causing a cart update submission where it wasn't needed, eg the items had not actually changed. The conditional here was designed to stop that from happening, but it was actually passing every time (the conditional logic was not actually catching the case it was supposed to).
This is really expensive!
2021-06-04 17:10:50 +01:00
