Matt-Yorkley
886e03af2f
Merge pull request #7805 from Matt-Yorkley/adjustments-admin
...
[Adjustments] Admin adjustments
2021-07-27 12:23:29 +02:00
Matt-Yorkley
9d4b34b35b
Merge pull request #7977 from Matt-Yorkley/tidy-up
...
Spree tidy-up
2021-07-27 11:52:22 +02:00
Luis Ramos
901c1589ee
Remove decorator, it's not needed now in v1.119 of active merchant
2021-07-25 16:08:30 +01:00
Matt-Yorkley
38aac70705
Remove class_eval on Spree::Gateway
2021-07-24 21:28:13 +01:00
Matt-Yorkley
0764484f41
Remove class_eval in PaymentMethodDistributors
2021-07-24 21:28:13 +01:00
Matt-Yorkley
87c7fceae9
Remove dead code for Ruby 1.8...
2021-07-24 21:28:13 +01:00
Matt-Yorkley
7493697955
Tidy up CalculatedAdjustments in Spree::PaymentMethod
2021-07-24 21:28:13 +01:00
Matt-Yorkley
2d69810c5d
Convert CalculatedAdjustments into a proper Concern and remove class_eval
2021-07-24 21:28:13 +01:00
Maikel
f448c95bbe
Merge pull request #7886 from apricot12/invalid_customer_email_subscription_fail
...
Add valid_email2 gem for email validation to fix subscription failures with invalid emails.
2021-07-16 10:20:37 +10:00
Andy Brett
a58e0fe217
Merge pull request #7926 from luisramos0/rubocop_fix
...
Update Rubocop todo files
2021-07-14 10:05:54 -07:00
Luis Ramos
1fb162bb4c
Result of running rubocop -a, safe auto correct
2021-07-13 23:06:56 +01:00
Luis Ramos
01fe6abeed
Result of rubocop -a, safe autocorrect
2021-07-13 22:38:05 +01:00
Matt-Yorkley
cb039fd880
Delete dead code Adjustment#display_included_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
12c9914d1b
Delete old Adjustment scopes #with_tax and #without_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
f2e63fff2e
Delete dead code TaxRate: #compute_tax and #with_tax_included_in_price
...
🎉
2021-07-09 21:49:36 +01:00
Matt-Yorkley
33fc5bbaa2
Delete dead code TaxRate#compute_tax
...
🎉
2021-07-09 21:49:36 +01:00
Matt-Yorkley
c60554a14a
Update display of associated tax amounts
2021-07-09 21:49:35 +01:00
Matt-Yorkley
ad1b9f3f2f
Update Adjustment#has_tax?
2021-07-09 21:49:35 +01:00
Matt-Yorkley
c16e008ba1
Delete dead code Adjustment#set_absolute_included_tax!
2021-07-09 21:49:35 +01:00
Matt-Yorkley
2b8b690892
Tidy up :valid scope in Spree::Payment
2021-07-09 13:28:38 +01:00
Matt-Yorkley
b4a9a6fea5
Add :incomplete scope in Spree::Payment
2021-07-09 13:28:19 +01:00
Matt-Yorkley
b1db06a3c6
Allow payments in requires_authorization state to be voided
2021-07-09 13:24:37 +01:00
Nihal Mohammed
db88121ed8
Update Customer model to validate email with valid_email2 gem
2021-07-07 20:30:06 +05:30
Andy Brett
46cd05c54a
Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer
...
Enable sorting by producer in shopfront
2021-07-06 09:27:42 -07:00
Andy Brett
3e860f6d54
Merge pull request #7781 from andrewpbrett/decouple-payments
...
Decouple payments
2021-07-01 18:07:01 -07:00
Matt-Yorkley
a0b9eff2c1
Merge pull request #7699 from guidoDutra/1971-inventory-page-field-validation
...
Add validation to inventory page fields
2021-07-01 16:59:20 +02:00
Andy Brett
a97b5b7c90
rename payment state machine events to be verbs
2021-06-29 11:54:51 -07:00
Andy Brett
d2701226b6
complete order immediately before adding payment
2021-06-29 11:45:33 -07:00
Andy Brett
1a6257257a
Merge pull request #7608 from luisramos0/rails61
...
[Rails 6.1] Upgrade to rails 6.1
2021-06-29 10:21:15 -07:00
Andy Brett
e24d2e5077
address deprecation warning
2021-06-29 09:17:31 -07:00
Andy Brett
7b87476986
Merge pull request #7804 from Matt-Yorkley/default-taxrate-check
...
Ignore potential error in dev where default tax rate is nil
2021-06-28 10:35:09 -07:00
Andy Brett
df0c98d013
Merge branch 'master' into rails61
2021-06-24 08:02:58 -07:00
Pau Pérez Fabregat
42e26f3328
Merge pull request #7708 from andrewpbrett/payment-states
...
Add `requires_authorization` Payment state
2021-06-18 17:04:03 +02:00
Pau Pérez Fabregat
4ecbf51b33
Merge pull request #7802 from Matt-Yorkley/confirmation-mails
...
Add a delay on sending order confirmation emails
2021-06-18 12:27:24 +02:00
Pau Pérez Fabregat
db993652c4
Merge branch 'master' into payment-states
2021-06-18 12:20:26 +02:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Luis Ramos
a253228b96
Add some rubocop disable commands in the code to avoid future wrong rubocop auto corrections
2021-06-17 22:26:54 +01:00
Andy Brett
b41302d5d8
update state transitions for new requires_authorization state
2021-06-17 14:23:59 -07:00
Andy Brett
dc1a24339c
update can_resend_auth_email
2021-06-17 14:23:59 -07:00
Andy Brett
527f4e2cb3
move payment to requires_authorization if cvv_result is present
2021-06-17 14:23:59 -07:00
Andy Brett
31738ceb49
rename and consolidate authorization? methods
2021-06-17 14:23:59 -07:00
Andy Brett
674ca3026b
change states after failure/requiring auth
2021-06-17 14:23:58 -07:00
Andy Brett
a3d9f1f3cc
create requires_authorization payment state and migration
2021-06-17 14:23:58 -07:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Matt-Yorkley
148349f0f3
Ignore potential error where default tax rate is nil
...
If the current tax rates are badly *misconfigured*, and an included-tax rate is being applied but a *default* rate does not exist (there are validations to stop this case from occurring, see DefaultTaxZoneValidator), this line can throw an error. This situation will not actually arise in production, but can happen fairly easily in dev or with staging data when switching datasets, and when it does it's kind of annoying.
Note: the logic in the check here is still good; if there's no default tax rate we check if the order's tax zone matches the zone for the current tax rate, which is correct.
2021-06-17 12:47:41 +01:00
Pau Pérez Fabregat
a8efbffca6
Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate
...
[Adjustments] TaxRate changes
2021-06-17 11:51:01 +02:00
Matt-Yorkley
bb848811e6
Add a delay on sending order confirmation emails
...
There's a race condition here that means the order's address is not always present when the email is first sent, but it *is* present shortly after. The fix in this commit is a temporary solution.
2021-06-17 09:35:25 +01:00
Guido Oliveira
baca89c575
allow select producers for ordering
2021-06-16 15:02:27 -03:00
Guido Oliveira
c5471fc25c
enable ordering shopfront by producer id
2021-06-16 15:02:27 -03:00
Matt-Yorkley
8753076dcd
Merge pull request #7737 from luisramos0/ruby273
...
Upgrade to ruby 2.7.3
2021-06-15 21:07:38 +02:00
