Matt-Yorkley
658f0eccbb
Replace ng-app with explicit Angular bootstrapping and move scripts to head
2021-09-08 10:34:34 +01:00
Matt-Yorkley
b4278aabbf
Merge branch 'master' into 8009-handling-shipping-adress
2021-09-07 09:44:49 +02:00
Matt-Yorkley
fbdc38b6c4
Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column-
...
Display variant quantity on the quantity column on the edit order page in backoffice
2021-09-02 20:45:22 +02: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
3fabe308cd
Extract #shipping_and_billing_match? helper
2021-09-01 15:04:33 +01:00
Matt-Yorkley
ebe2923512
Improve form outputs and error handling
2021-09-01 14:16:32 +01: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
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
Jean-Baptiste Bellet
748a37f670
Terms and conditions error message
2021-08-26 09:28:31 +02: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
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
Andy Brett
ea6739d565
guard against a nil value for @order.user
2021-08-24 11:46:50 -07: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
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
Jean-Baptiste Bellet
402bfdac30
Show/Hide shipping address form depending on the checkbox/radio state
2021-08-19 10:34:07 +02:00
Jean-Baptiste Bellet
c806b3e889
Be more generic: address is enough
...
as it could be billing or shipping address
2021-08-19 10:33:16 +02:00
Matt-Yorkley
63dc188d5e
Merge pull request #8032 from Matt-Yorkley/order-confirm
...
Split checkout backend
2021-08-16 23:12:06 +02:00
Matt-Yorkley
744bd9d1be
Only load Google Maps JS where it's actually needed
2021-08-16 15:31:00 +01:00
Matt-Yorkley
a98e4417c0
Only inject taxons and properties AMS data in pages where it's actually needed
2021-08-16 13:22:06 +01:00
Nihal Mohammed
2be8e15797
Allow copy paste of email from contact tab and footer without reversing
2021-08-13 15:57:59 +05:30
Matt-Yorkley
98ae82147c
Avoid using Angular in shipping and payment method display
2021-08-12 12:53:45 +01:00
Matt-Yorkley
ffc3736f4b
Update fields on confirmation page
2021-08-12 12:53:45 +01:00
Matt-Yorkley
41ffffe170
Tidy up use of @checkout_step
2021-08-12 12:53:45 +01:00
Matt-Yorkley
2a12e21cf4
Merge pull request #8034 from Matt-Yorkley/live
...
Fix deprecated syntax for live() function
2021-08-12 13:47:50 +02:00
Matt-Yorkley
0158106f28
Merge pull request #7949 from Matt-Yorkley/producers-caching
...
Fragment-Cache producers AMS data
2021-08-12 13:27:41 +02:00
Matt-Yorkley
fa94392fb6
Fix deprecated syntax for live() function
2021-08-12 12:09:55 +01:00
Matt-Yorkley
3c2c3a1801
Extract helper and update tabs
2021-08-11 16:17:29 +01:00
Matt-Yorkley
d113f2a5fc
Merge pull request #8004 from jibees/split-checkout-step-3
...
Split checkout step 3
2021-08-11 16:41:23 +02:00
Matt-Yorkley
a631d057f1
Update payment methods form
2021-08-11 15:22:28 +01:00
Matt-Yorkley
8f7c3a9369
Remove more unused AMS data injection
2021-08-11 15:22:28 +01:00
Jean-Baptiste Bellet
b66b1fcdae
Add step 3
2021-08-11 15:22:26 +01:00
Jean-Baptiste Bellet
4c81f0f27b
Specify name for this payment input
2021-08-11 15:20:03 +01:00
Jean-Baptiste Bellet
c286189225
Add link into success tab
...
to go back to previous step and edit details once completed
2021-08-11 15:20:01 +01:00
Jean-Baptiste Bellet
66892ed51a
Add a success class for step that are already validated
2021-08-11 15:17:08 +01:00
Jean-Baptiste Bellet
623753a745
Add right name to the radio button input
2021-08-11 15:15:31 +01:00
Matt-Yorkley
85e83807cf
Merge pull request #7989 from Matt-Yorkley/invoice-display
...
Invoice display
2021-08-10 14:14:41 +02:00
Matt-Yorkley
2595cb85f7
Merge pull request #8001 from Matt-Yorkley/terms-and-conditionals
...
Fix platform terms of service checkbox
2021-08-05 14:17:48 +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
937ba3ca0a
Ensure previously selected shipping method is selected in form
2021-08-03 11:24:17 +02:00
Matt-Yorkley
a32ca23ca5
Simplify routes and partials
2021-08-03 11:24:03 +02:00
Matt-Yorkley
aba3cf99a3
Fix address2 field
2021-08-03 11:23:58 +02:00
Matt-Yorkley
d10899d9ea
Simplify use of nested field helpers
2021-08-03 11:23:53 +02:00
