Cillian O'Ruanaidh
2462d71ab5
When creating backoffice orders hide variants with no stock by default
...
But let people include out of stock variants by checking a checkbox if they want.
Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.
Co-authored-by: Maikel Linke <maikel@email.org.au >
2021-10-08 13:13:32 +01:00
Maikel Linke
129c4c92fa
Catch JS error on OC page
...
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.
Fixing this then revealed a missing require statement in a controller.
2021-10-06 15:29:41 +11:00
Maikel
c9d36e6f5c
Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all
...
Fix payment method fee bug for all calculator types
2021-09-28 08:39:05 +10:00
Maikel
a3c31f7d86
Revert "Kill stripe connect"
2021-09-20 08:39:34 +10:00
Meron Ogbai
cd992ee866
Validate preferred values all calculators
2021-09-17 18:50:29 +03:00
Meron Ogbai
957f834694
Rename preferred amount to preferred value
2021-09-17 18:49:57 +03:00
Meron Ogbai
d73df78f43
Extract gateway_params to a private method
2021-09-17 16:48:53 +03:00
Matt-Yorkley
f4c86a1b51
Merge pull request #8061 from Matt-Yorkley/turbo-checkout
...
Split Checkout new toys
2021-09-17 10:48:59 +02:00
Luis Ramos
60a8ae6675
Remove Stripe Connect gateway and related code
2021-09-10 14:43:24 +05:30
Maikel
9affc6a945
Merge pull request #8108 from Matt-Yorkley/andand
...
Remove `andand` gem
2021-09-10 15:06:00 +10:00
Andy Brett
9124e03c11
Merge pull request #8144 from meronokbay/6942-fix-payment-method-fee-bug
...
6942 fix payment method fee bug
2021-09-09 09:28:40 -07:00
Matt-Yorkley
48d4341e2d
Merge pull request #8112 from cillian/eager-load-permissions-with-enterprise-relationships
...
Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
2021-09-08 19:46:14 +02:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Matt-Yorkley
8bf3f72ad3
Extract CableCar responses code to a concern
2021-09-08 10:34:34 +01:00
Matt-Yorkley
5ef34347a3
Implement optional non-Angular flash messages
2021-09-08 10:34:34 +01:00
Matt-Yorkley
e48b9d84e5
Extract boilerplate code
2021-09-08 10:34:34 +01:00
Matt-Yorkley
03abc395f2
Update responses to use cable_ready
2021-09-08 10:34:34 +01:00
Matt-Yorkley
9be73a8ff1
Respond with HTTP error code on update failure
2021-09-08 10:34:34 +01:00
Matt-Yorkley
3bcfc673f7
Ensure selected shipping method is actually selected
...
Hashes with symbol keys != hashes with string keys 🙈
2021-09-06 20:58:22 +01:00
Matt-Yorkley
fb7a3a681b
Validate attributes per checkout step and decouple order-advancing
2021-09-06 14:25:16 +01:00
Matt-Yorkley
71412f8d4b
Update validations
2021-09-06 14:22:28 +01:00
Matt-Yorkley
70513ae989
Don't transition to address before page load
2021-09-05 20:19:22 +01:00
Meron Ogbai
5ca552d380
Show flash error if preferred amount isn't valid
2021-09-05 01:11:12 +03:00
Matt-Yorkley
9d6e5e9420
Remove currently unused code
2021-09-01 15:04:53 +01:00
Matt-Yorkley
1fca7d2a6c
Remove error-clearing from edit action
2021-09-01 15:04:53 +01:00
Matt-Yorkley
4cff185b4b
Extract params handling to service
2021-09-01 15:04:53 +01:00
Matt-Yorkley
57504f42d8
Move validations to state transitions
2021-09-01 15:04:53 +01:00
Matt-Yorkley
9800483433
Simplify displaying selected shipping method
2021-09-01 15:04:33 +01:00
Matt-Yorkley
b7e1882bd8
Simplify setting address params
2021-09-01 15:04:33 +01:00
Matt-Yorkley
3fabe308cd
Extract #shipping_and_billing_match? helper
2021-09-01 15:04:33 +01:00
Matt-Yorkley
ac4d721de0
Extract #set_payment_amount method
2021-09-01 15:04:33 +01:00
Matt-Yorkley
2786fb30ba
Simplify order advancing process
2021-09-01 15:04:33 +01:00
Matt-Yorkley
3dd8ed85b4
Implement manual shipping method selection
2021-09-01 14:16:32 +01:00
Matt-Yorkley
ebe2923512
Improve form outputs and error handling
2021-09-01 14:16:32 +01:00
Andy Brett
fba7699d0b
select shipping method when advancing to payment
2021-08-31 11:00:54 +02:00
Jean-Baptiste Bellet
a1438f91e9
Display error on email (triggered by advance_order_state method)
2021-08-31 11:00:54 +02:00
Cillian O'Ruanaidh
e1478e3ae8
Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
...
For #8028
2021-08-27 12:01:25 +01:00
Jean-Baptiste Bellet
748a37f670
Terms and conditions error message
2021-08-26 09:28:31 +02:00
Jean-Baptiste Bellet
44ab87961a
i18nize the global error message
2021-08-26 09:28:31 +02:00
Andy Brett
bee1b1a097
respect checkbox for ship address same as bill address
2021-08-25 15:22:25 -07:00
Andy Brett
759c5d6bdd
don't override existing addresses on order with AddressFinder
2021-08-25 13:11:48 -07:00
Andy Brett
d86148420a
improve shipping_method_id handling
2021-08-24 12:29:48 -07:00
Andy Brett
7dd2c09641
ensure terms are accepted before order is placed
2021-08-24 12:29:23 -07:00
Andy Brett
3414d9f057
clear errors on ship address as well
2021-08-24 12:15:20 -07:00
Andy Brett
71076d36a1
favor dig to protect against nils
2021-08-24 11:54:02 -07:00
Andy Brett
874e1d7f02
only advance order to payment if no payment exists
2021-08-24 11:23:08 -07:00
Andy Brett
417770e716
guard against nil when populating ship address
2021-08-24 11:22:20 -07:00
Andy Brett
ea695105b5
populate ship address with bill address if no ship address
2021-08-24 10:57:36 -07:00
Jean-Baptiste Bellet
9fd126ca0f
The ship address is filled from bill address for some attributes
...
firstname, lastname and phone are the same between those two address. Fill it automatically.
2021-08-23 15:42:29 +02:00
Jean-Baptiste Bellet
1ecfeca88c
Populate view with both shipping_method_id & ship_address_same_as_billing
...
... and then handle correctly the display of the form
2021-08-23 15:23:53 +02:00
