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
6acb1f6484
Tidy up view variables
2021-09-01 15:04:33 +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
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
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
Andy Brett
69ec17ef92
do not require phone number on orders
2021-08-31 10:59:13 +02:00
Andy Brett
ca7da94fd8
Merge pull request #8088 from jibees/8087-select-unselect-orders-in-admin
...
Handle select/unselect all orders in the admin orders page
2021-08-28 11:34:20 -07:00
Jean-Baptiste Bellet
5c05be22f5
As it is a quantity column, display variant quantity
...
(this column was confused, and was understood like a simply quantity column not the item quantity separated according to its "state")
Update specs as well
2021-08-27 15:15:14 +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
Andy Brett
2d511c6d18
Merge pull request #8044 from apricot12/Undo_reversing_of_email_copy_paste
...
Allow copy paste of email from contact tab and footer without reversing
2021-08-26 10:02:09 -07:00
Andy Brett
3fcce8574e
Merge pull request #8040 from guidoDutra/7627-prevent-removing-last-item-in-order
...
Prevent removing last item in order
2021-08-26 10:01:42 -07: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
Jean-Baptiste Bellet
b5024c5a16
On summary page, display shipping address as well as billing one
2021-08-25 16:31:45 +02:00
Jean-Baptiste Bellet
642e822e0e
button is rounded
2021-08-25 15:58:55 +02:00
Jean-Baptiste Bellet
10ddaf4384
Last step (ie. summary) is larger than the two previous step
2021-08-25 15:53:22 +02:00
Jean-Baptiste Bellet
75390d2a48
Specify right i18n key
2021-08-25 15:29:24 +02:00
Jean-Baptiste Bellet
82ea33e9ca
Do not display ship address form if not needed
...
ie. the shipping method does not require any address
2021-08-25 11:10:47 +02:00
vishaldeepak
813deb49a4
Add customer information to mail when we notify producers when required
2021-08-25 08:29:54 +05:30
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
ea6739d565
guard against a nil value for @order.user
2021-08-24 11:46:50 -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
Jean-Baptiste Bellet
fe65359d71
Display no shipping method selected error
2021-08-23 10:16:53 +02:00
Matt-Yorkley
697a073330
Merge pull request #8060 from Matt-Yorkley/script-split
...
Maps and AMS conditional loading
2021-08-21 16:35:46 +02:00
Andy Brett
3bee30ac60
clear error messages on order and bill address on first load
2021-08-20 09:18:08 -07:00
Jean-Baptiste Bellet
26c5361b0a
set shipping method only if param is present
2021-08-20 09:18:08 -07:00
Jean-Baptiste Bellet
8fe0a82b75
Change ng-click to ng-change to capture ng-model updated value
...
- Create a feature test for this feature
2021-08-20 15:18:09 +02:00
Nihal Mohammed
92ecdb4163
Add Angular directive to undo reverse of email
2021-08-20 18:34:42 +05:30
Nihal Mohammed
d2dcfa5848
Undo changes
2021-08-20 13:15:44 +05:30
Andy Brett
138b7824ba
remove ship address if shipping method does not require it
2021-08-19 10:18:11 -07:00
Andy Brett
dd00c30503
fill ship address with bill address if checkbox is checked
2021-08-19 10:17:51 -07:00
Andy Brett
c07046e2f6
return an error if no shipping method is selected
2021-08-19 10:16:46 -07:00
Jean-Baptiste Bellet
402bfdac30
Show/Hide shipping address form depending on the checkbox/radio state
2021-08-19 10:34:07 +02:00
