first delivery method is checked by default, improved JS behaviour

Author: David Alexa

src/Sylius/Bundle/CoreBundle/Checkout/Step/PaymentShippingStep.php

@@ -55,17 +55,12 @@ public function forwardAction(ProcessContextInterface $context)
 
 		$this->dispatchCheckoutEvent(SyliusCheckoutEvents::SHIPPING_INITIALIZE, $order);
 		$formShippingPre = $this->createCheckoutShippingForm($order, null);
-		$formShippingPre->handleRequest($request);
 
 		if ($formShippingPre->get('country')->getData() === null) {
 			$choices = $formShippingPre->get('country')->getConfig()->getOption('choice_list')->getChoices();
 			$formShippingPre->get('country')->setData(reset($choices));
 		}
-
-		$this->dispatchCheckoutEvent(SyliusCheckoutEvents::SHIPPING_INITIALIZE, $order);
-		$formShipping = $this->createCheckoutShippingForm($order, $formShippingPre->get('country')->getData());
-		$formShipping->handleRequest($request);
-
+		$formShippingPre->handleRequest($request);
 
 		$this->dispatchCheckoutEvent(SyliusCheckoutEvents::ADDRESSING_INITIALIZE, $order);
 		if (is_null($order->getShippingAddress()) || $order->getShippingAddress()->getFirstName() == 'anon.') {

src/Sylius/Bundle/WebBundle/Resources/public/js/payment_shipping.js

@@ -4,15 +4,7 @@
 
 $(document).ready(function() {
 	$("body").on('change, click', '#shippings input[type="radio"]', function() {
-		var $addressing = $("#addressing");
-		var requiredIds = $("#shippings").data('shippingsRequiresAddressing');
-		var id = parseInt($(this).val(), 10);
-
-		if (requiredIds.ids.indexOf(id) !== -1) {
-			$addressing.removeClass('js-hidden');
-		} else {
-			$addressing.addClass('js-hidden');
-		}
+		toggleAddressing($(this));
 	}).on('change', '#sylius_checkout_shipping_country_specific_country, #sylius_checkout_addressing_shippingAddress_country', function() {
 		var $form = $(this).parents('form');
 		var $input = $form.prepend($("<input/>").attr('type', 'hidden').attr('name', 'doNotForward').val(true));
@@ -41,9 +33,20 @@ $(document).ready(function() {
 	});
 
 	function checkFirstShipping() {
-		if (!$("#shippings input[type='radio']:checked").length) {
-			$("#shippings input[type='radio']").first().click();
+		toggleAddressing($("#shippings input[type='radio']:checked"));
+	}
+
+	function toggleAddressing($selectedShipping) {
+		var $addressing = $("#addressing");
+		var requiredIds = $("#shippings").data('shippingsRequiresAddressing');
+		var id = parseInt($selectedShipping.val(), 10);
+
+		if (requiredIds.ids.indexOf(id) !== -1) {
+			$addressing.removeClass('js-hidden');
+		} else {
+			$addressing.addClass('js-hidden');
 		}
 	}
+
 	checkFirstShipping();
 });

src/Sylius/Bundle/WebBundle/Resources/views/Common/_forms.html.twig

@@ -124,8 +124,12 @@
                         <span class="pull-right text-muted">{{ shipping_costs[child.vars.value]|sylius_price }}</span>
                     {% endif %}
                     <label{% for attrname, attrvalue in child.vars.label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
+                    {% if loop.first %}
+                        {{ form_widget(child, {'attr': {'checked': 'checked'}}) }}
+                    {% else %}
                         {{ form_widget(child) }}
-                        {{ child.vars.label|trans({}, translation_domain) }}
+                    {% endif %}
+                    {{ child.vars.label|trans({}, translation_domain) }}
                     </label>
                 </div>
             {% endfor %}

src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Checkout/Step/PaymentShipping/shipping.html.twig

@@ -8,10 +8,9 @@
 		{{ form_row(form.country, {'attr': {'autocomplete': 'off'}}) }}
 		{% for shipment in order.shipments %}
 			{% set shipmentForm = form.shipments[loop.index0] %}
-			{% if loop.first %}{{ form_errors(shipmentForm.method) }}{% endif %}
-
+			{{ form_errors(shipmentForm.method) }}
 			<div class="no-cols clearfix checkbox-row">
-				{{ form_widget(shipmentForm.method, {'attr': {'checked': 'checked'}}) }}
+				{{ form_widget(shipmentForm.method) }}
 			</div>
 
 		{% endfor %}