Matt-Yorkley
57504f42d8
Move validations to state transitions
2021-09-01 15:04:53 +01:00
Matt-Yorkley
978c882ed9
Don't select a random shipping method in Shipment
2021-09-01 15:04:33 +01:00
Matt-Yorkley
3dd8ed85b4
Implement manual shipping method selection
2021-09-01 14:16:32 +01:00
Jean-Baptiste Bellet
a1438f91e9
Display error on email (triggered by advance_order_state method)
2021-08-31 11:00:54 +02:00
Andy Brett
69ec17ef92
do not require phone number on orders
2021-08-31 10:59:13 +02:00
jibees
1ab7cb517f
Merge pull request #8058 from Matt-Yorkley/n-plus-ones
...
Fix some N+1s
2021-08-17 10:02:20 +02:00
Matt-Yorkley
20a3940605
Fix N+1 in #items_bought_by_user
2021-08-16 14:58:52 +01:00
Matt-Yorkley
5fb3943634
Validate payment object exists before advancing from payment to confirmation
2021-08-12 12:53:45 +01:00
Matt-Yorkley
6c885f0f42
Declare validations together
2021-08-12 12:53:45 +01:00
Matt-Yorkley
4d77d4df77
Add confirm event and update workflow helpers
2021-08-11 15:53:01 +01:00
Matt-Yorkley
055c6b78af
Add order confirmation step to checkout flow
2021-08-11 15:53:01 +01:00
Matt-Yorkley
05dcf75ff9
Merge pull request #7990 from Matt-Yorkley/void-transactions
...
Cancel payments on stock shortages
2021-08-05 00:38:33 +02:00
Matt-Yorkley
a92847d80d
Merge pull request #7947 from andrewpbrett/zeitwerk
...
Use zeitwerk for autoloading
2021-08-05 00:36:32 +02:00
Matt-Yorkley
b15ae89944
Merge pull request #7840 from jibees/new-checkout-first-step
...
New checkout first + second step
2021-08-03 12:00:26 +02:00
Matt-Yorkley
7e3b9be506
Allow StripeSCA Gateway to actually void payments
2021-07-30 11:48:57 +01:00
Jean-Baptiste Bellet
434f9600b7
Enterprise fee must be linked with an enterprise
...
Add 2 validation / errorproof options:
- Add rails validation on `enterprise_id` on enterprise_fee model
- Do not add a blank option on the select: ie. user can select a blank enterprise in the form
Update tests as well
2021-07-27 15:39:40 +02:00
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
Jean-Baptiste Bellet
87a0a5846d
WIP; only advance order to delivery state
...
Use the hidden_field_tag rails helper and move it
2021-07-26 15:47:36 +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
Andy Brett
84c3b39e15
use zeitwerk for autoloading
2021-07-17 16:41:35 -07: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
