@@ -35,9 +35,9 @@ |
||
35 | 35 | { |
36 | 36 | $xpath = $this->themeConfiguration->getNavigationBaseXPathSelector(); |
37 | 37 | usleep(500000); // Give the UI some time to update |
38 | - $xpath .= '/descendant::' . $this->themeConfiguration->getNavigationChildXPathSelector($path); |
|
38 | + $xpath .= '/descendant::'.$this->themeConfiguration->getNavigationChildXPathSelector($path); |
|
39 | 39 | |
40 | - $element = $this->webdriver->byXpath($xpath . '/a'); |
|
40 | + $element = $this->webdriver->byXpath($xpath.'/a'); |
|
41 | 41 | |
42 | 42 | $this->execute($element); |
43 | 43 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | // If we are passed just the class name we will prepend it with Magium\Magento\Actions\Checkout\PaymentMethods |
29 | 29 | if (strpos($method, '\\') === false) { |
30 | - $method = 'Checkout\PaymentMethods\\' . $method; |
|
30 | + $method = 'Checkout\PaymentMethods\\'.$method; |
|
31 | 31 | $method = self::resolveClass($method, 'Actions'); |
32 | 32 | } |
33 | 33 | $reflection = new \ReflectionClass($method); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | // If we are passed just the class name we will prepend it with Magium\Magento\Actions\Checkout\PaymentMethods |
72 | 72 | if (strpos($method, '\\') === false) { |
73 | - $method = 'Magium\Magento\Actions\Checkout\ShippingMethods\\' . $method; |
|
73 | + $method = 'Magium\Magento\Actions\Checkout\ShippingMethods\\'.$method; |
|
74 | 74 | } |
75 | 75 | $reflection = new \ReflectionClass($method); |
76 | 76 | if ($reflection->implementsInterface('Magium\Magento\Actions\Checkout\ShippingMethods\ShippingMethodInterface')) { |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | if ($reflection->isSubclassOf('Magium\Magento\Themes\NavigableThemeInterface')) { |
88 | 88 | // Not entirely sure of hardcoding the various interface types. May make this configurable |
89 | 89 | parent::switchThemeConfiguration($fullyQualifiedClassName); |
90 | - $this->setTypePreference('Magium\Magento\Themes\AbstractThemeConfiguration',$fullyQualifiedClassName); |
|
91 | - $this->setTypePreference('Magium\Magento\Themes\NavigableThemeInterface',$fullyQualifiedClassName); |
|
92 | - $this->setTypePreference('Magium\Themes\BaseThemeInterface',$fullyQualifiedClassName); |
|
90 | + $this->setTypePreference('Magium\Magento\Themes\AbstractThemeConfiguration', $fullyQualifiedClassName); |
|
91 | + $this->setTypePreference('Magium\Magento\Themes\NavigableThemeInterface', $fullyQualifiedClassName); |
|
92 | + $this->setTypePreference('Magium\Themes\BaseThemeInterface', $fullyQualifiedClassName); |
|
93 | 93 | |
94 | - $this->setTypePreference('Magium\Magento\Themes\Customer\AbstractThemeConfiguration',$this->getTheme()->getCustomerThemeClass()); |
|
95 | - $this->setTypePreference('Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration',$this->getTheme()->getCheckoutThemeClass()); |
|
94 | + $this->setTypePreference('Magium\Magento\Themes\Customer\AbstractThemeConfiguration', $this->getTheme()->getCustomerThemeClass()); |
|
95 | + $this->setTypePreference('Magium\Magento\Themes\OnePageCheckout\AbstractThemeConfiguration', $this->getTheme()->getCheckoutThemeClass()); |
|
96 | 96 | } else { |
97 | 97 | throw new InvalidConfigurationException('The theme configuration extend Magium\Magento\Themes\NavigableThemeInterface'); |
98 | 98 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public $shippingNewAddressXpath = '//select[@id="shipping-address-select"]/option[.="{{New Address}}"]'; |
58 | 58 | |
59 | 59 | public $billingContinueButtonXpath = '//div[@id="billing-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
60 | - public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
60 | + public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
61 | 61 | |
62 | 62 | |
63 | 63 | public $shippingFirstNameXpath = '//input[@id="shipping:firstname"]'; |
@@ -79,24 +79,24 @@ discard block |
||
79 | 79 | public $shippingTelephoneXpath = '//input[@id="shipping:telephone"]'; |
80 | 80 | public $shippingFaxXpath = '//input[@id="shipping:fax"]'; |
81 | 81 | public $shippingContinueButtonXpath = '//div[@id="shipping-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
82 | - public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | - public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
82 | + public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | + public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
84 | 84 | |
85 | 85 | public $shippingMethodContinueButtonXpath = '//div[@id="shipping-method-buttons-container"]/descendant::button'; |
86 | - public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
86 | + public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
87 | 87 | |
88 | 88 | public $paymentMethodContinueCompleteXpath = '//span[@id="payment-please-wait"]'; |
89 | 89 | |
90 | 90 | public $paymentMethodContinueButtonXpath = '//div[@id="payment-buttons-container"]/descendant::button'; |
91 | 91 | |
92 | - public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
92 | + public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
93 | 93 | |
94 | 94 | public $orderReceivedCompleteXpath = '//h1[.="Your order has been received."]'; |
95 | 95 | |
96 | 96 | public $shippingMethodFormXpath = '//form[@id="co-shipping-method-form"]'; |
97 | 97 | |
98 | 98 | public $passwordInputXpath = '//input[@id="billing:customer_password"]'; |
99 | - public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
99 | + public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
100 | 100 | |
101 | 101 | /** |
102 | 102 | * This is a hard one. Each of the summary checkout products will be iterated over until they cannot be found. Having |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | public $cartSummaryCheckoutProductLoopQtyXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Qty}}"])[%d]'; |
114 | 114 | public $cartSummaryCheckoutProductLoopSubtotalXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Subtotal}}"])[%d]'; |
115 | 115 | |
116 | - public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | - public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | - public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | - public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
116 | + public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | + public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | + public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | + public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
120 | 120 | |
121 | 121 | public $orderNumberExtractorXpath = '//p[contains(., "Your order # is:")]'; |
122 | 122 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public $shippingNewAddressXpath = '//select[@id="shipping-address-select"]/option[.="{{New Address}}"]'; |
58 | 58 | |
59 | 59 | public $billingContinueButtonXpath = '//div[@id="billing-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
60 | - public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
60 | + public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
61 | 61 | |
62 | 62 | |
63 | 63 | public $shippingFirstNameXpath = '//input[@id="shipping:firstname"]'; |
@@ -79,24 +79,24 @@ discard block |
||
79 | 79 | public $shippingTelephoneXpath = '//input[@id="shipping:telephone"]'; |
80 | 80 | public $shippingFaxXpath = '//input[@id="shipping:fax"]'; |
81 | 81 | public $shippingContinueButtonXpath = '//div[@id="shipping-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
82 | - public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | - public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
82 | + public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | + public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
84 | 84 | |
85 | 85 | public $shippingMethodContinueButtonXpath = '//div[@id="shipping-method-buttons-container"]/descendant::button'; |
86 | - public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
86 | + public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
87 | 87 | |
88 | 88 | public $paymentMethodContinueCompleteXpath = '//span[@id="payment-please-wait"]'; |
89 | 89 | |
90 | 90 | public $paymentMethodContinueButtonXpath = '//div[@id="payment-buttons-container"]/descendant::button'; |
91 | 91 | |
92 | - public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
92 | + public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
93 | 93 | |
94 | 94 | public $orderReceivedCompleteXpath = '//h1[.="Your order has been received."]'; |
95 | 95 | |
96 | 96 | public $shippingMethodFormXpath = '//form[@id="co-shipping-method-form"]'; |
97 | 97 | |
98 | 98 | public $passwordInputXpath = '//input[@id="billing:customer_password"]'; |
99 | - public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
99 | + public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
100 | 100 | |
101 | 101 | /** |
102 | 102 | * This is a hard one. Each of the summary checkout products will be iterated over until they cannot be found. Having |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | public $cartSummaryCheckoutProductLoopQtyXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Qty}}"])[%d]'; |
114 | 114 | public $cartSummaryCheckoutProductLoopSubtotalXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Subtotal}}"])[%d]'; |
115 | 115 | |
116 | - public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | - public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | - public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | - public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
116 | + public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | + public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | + public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | + public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
120 | 120 | |
121 | 121 | public $orderNumberExtractorXpath = '//p[contains(., "Your order # is:")]'; |
122 | 122 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * @param $label |
|
34 | + * @param string $label |
|
35 | 35 | * @return WebDriverElement |
36 | 36 | */ |
37 | 37 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public $shippingNewAddressXpath = '//select[@id="shipping-address-select"]/option[.="{{New Address}}"]'; |
58 | 58 | |
59 | 59 | public $billingContinueButtonXpath = '//div[@id="billing-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
60 | - public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
60 | + public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
61 | 61 | |
62 | 62 | |
63 | 63 | public $shippingFirstNameXpath = '//input[@id="shipping:firstname"]'; |
@@ -79,24 +79,24 @@ discard block |
||
79 | 79 | public $shippingTelephoneXpath = '//input[@id="shipping:telephone"]'; |
80 | 80 | public $shippingFaxXpath = '//input[@id="shipping:fax"]'; |
81 | 81 | public $shippingContinueButtonXpath = '//div[@id="shipping-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
82 | - public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | - public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
82 | + public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | + public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
84 | 84 | |
85 | 85 | public $shippingMethodContinueButtonXpath = '//div[@id="shipping-method-buttons-container"]/descendant::button'; |
86 | - public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
86 | + public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
87 | 87 | |
88 | 88 | public $paymentMethodContinueCompleteXpath = '//span[@id="payment-please-wait"]'; |
89 | 89 | |
90 | 90 | public $paymentMethodContinueButtonXpath = '//div[@id="payment-buttons-container"]/descendant::button'; |
91 | 91 | |
92 | - public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
92 | + public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
93 | 93 | |
94 | 94 | public $orderReceivedCompleteXpath = '//h1[.="Your order has been received."]'; |
95 | 95 | |
96 | 96 | public $shippingMethodFormXpath = '//form[@id="co-shipping-method-form"]'; |
97 | 97 | |
98 | 98 | public $passwordInputXpath = '//input[@id="billing:customer_password"]'; |
99 | - public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
99 | + public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
100 | 100 | |
101 | 101 | /** |
102 | 102 | * This is a hard one. Each of the summary checkout products will be iterated over until they cannot be found. Having |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | public $cartSummaryCheckoutProductLoopQtyXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Qty}}"])[%d]'; |
114 | 114 | public $cartSummaryCheckoutProductLoopSubtotalXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Subtotal}}"])[%d]'; |
115 | 115 | |
116 | - public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | - public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | - public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | - public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
116 | + public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | + public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | + public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | + public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
120 | 120 | |
121 | 121 | public $orderNumberExtractorXpath = '//p[contains(., "Your order # is:")]'; |
122 | 122 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public $shippingNewAddressXpath = '//select[@id="shipping-address-select"]/option[.="{{New Address}}"]'; |
58 | 58 | |
59 | 59 | public $billingContinueButtonXpath = '//div[@id="billing-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
60 | - public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
60 | + public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
61 | 61 | |
62 | 62 | |
63 | 63 | public $shippingFirstNameXpath = '//input[@id="shipping:firstname"]'; |
@@ -79,24 +79,24 @@ discard block |
||
79 | 79 | public $shippingTelephoneXpath = '//input[@id="shipping:telephone"]'; |
80 | 80 | public $shippingFaxXpath = '//input[@id="shipping:fax"]'; |
81 | 81 | public $shippingContinueButtonXpath = '//div[@id="shipping-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
82 | - public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | - public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
82 | + public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | + public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
84 | 84 | |
85 | 85 | public $shippingMethodContinueButtonXpath = '//div[@id="shipping-method-buttons-container"]/descendant::button'; |
86 | - public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
86 | + public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
87 | 87 | |
88 | 88 | public $paymentMethodContinueCompleteXpath = '//span[@id="payment-please-wait"]'; |
89 | 89 | |
90 | 90 | public $paymentMethodContinueButtonXpath = '//div[@id="payment-buttons-container"]/descendant::button'; |
91 | 91 | |
92 | - public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
92 | + public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
93 | 93 | |
94 | 94 | public $orderReceivedCompleteXpath = '//h1[.="Your order has been received."]'; |
95 | 95 | |
96 | 96 | public $shippingMethodFormXpath = '//form[@id="co-shipping-method-form"]'; |
97 | 97 | |
98 | 98 | public $passwordInputXpath = '//input[@id="billing:customer_password"]'; |
99 | - public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
99 | + public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
100 | 100 | |
101 | 101 | /** |
102 | 102 | * This is a hard one. Each of the summary checkout products will be iterated over until they cannot be found. Having |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | public $cartSummaryCheckoutProductLoopQtyXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Qty}}"])[%d]'; |
114 | 114 | public $cartSummaryCheckoutProductLoopSubtotalXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Subtotal}}"])[%d]'; |
115 | 115 | |
116 | - public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | - public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | - public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | - public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
116 | + public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | + public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | + public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | + public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
120 | 120 | |
121 | 121 | public $orderNumberExtractorXpath = '//p[contains(., "Your order # is:")]'; |
122 | 122 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public $shippingNewAddressXpath = '//select[@id="shipping-address-select"]/option[.="{{New Address}}"]'; |
58 | 58 | |
59 | 59 | public $billingContinueButtonXpath = '//div[@id="billing-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
60 | - public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
60 | + public $billingContinueCompletedXpath = '//span[@id="billing-please-wait"]'; |
|
61 | 61 | |
62 | 62 | |
63 | 63 | public $shippingFirstNameXpath = '//input[@id="shipping:firstname"]'; |
@@ -79,24 +79,24 @@ discard block |
||
79 | 79 | public $shippingTelephoneXpath = '//input[@id="shipping:telephone"]'; |
80 | 80 | public $shippingFaxXpath = '//input[@id="shipping:fax"]'; |
81 | 81 | public $shippingContinueButtonXpath = '//div[@id="shipping-buttons-container"]/descendant::button[@title="{{Continue}}"]'; |
82 | - public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | - public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
82 | + public $shippingContinueCompletedXpath = '//span[@id="shipping-please-wait"]'; |
|
83 | + public $shippingMethodContinueCompletedXpath = '//span[@id="shipping-method-please-wait"]'; |
|
84 | 84 | |
85 | 85 | public $shippingMethodContinueButtonXpath = '//div[@id="shipping-method-buttons-container"]/descendant::button'; |
86 | - public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
86 | + public $defaultShippingXpath = '//input[@name="shipping_method"]'; |
|
87 | 87 | |
88 | 88 | public $paymentMethodContinueCompleteXpath = '//span[@id="payment-please-wait"]'; |
89 | 89 | |
90 | 90 | public $paymentMethodContinueButtonXpath = '//div[@id="payment-buttons-container"]/descendant::button'; |
91 | 91 | |
92 | - public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
92 | + public $placeOrderButtonXpath = '//div[@id="review-buttons-container"]/descendant::button[@title="{{Place Order}}"]'; |
|
93 | 93 | |
94 | 94 | public $orderReceivedCompleteXpath = '//h1[.="Your order has been received."]'; |
95 | 95 | |
96 | 96 | public $shippingMethodFormXpath = '//form[@id="co-shipping-method-form"]'; |
97 | 97 | |
98 | 98 | public $passwordInputXpath = '//input[@id="billing:customer_password"]'; |
99 | - public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
99 | + public $confirmPasswordInputXpath = '//input[@id="billing:confirm_password"]'; |
|
100 | 100 | |
101 | 101 | /** |
102 | 102 | * This is a hard one. Each of the summary checkout products will be iterated over until they cannot be found. Having |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | public $cartSummaryCheckoutProductLoopQtyXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Qty}}"])[%d]'; |
114 | 114 | public $cartSummaryCheckoutProductLoopSubtotalXpath = '(//table[@id="checkout-review-table"]/tbody/descendant::td[@data-rwd-label="{{Subtotal}}"])[%d]'; |
115 | 115 | |
116 | - public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | - public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | - public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | - public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
116 | + public $cartSummaryCheckoutSubTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Subtotal}} "]/../td[2]'; |
|
117 | + public $cartSummaryCheckoutTax = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Tax}} "]/../td[2]'; |
|
118 | + public $cartSummaryCheckoutGrandTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[concat(" ",normalize-space(.)," ") = " {{Grand Total}} "]/../td[2]'; |
|
119 | + public $cartSummaryCheckoutShippingTotal = '//table[@id="checkout-review-table"]/tfoot/tr/td[contains(concat(" ",normalize-space(.)," "), " {{Shipping & Handling}} (")]/../td[2]'; |
|
120 | 120 | |
121 | 121 | public $orderNumberExtractorXpath = '//p[contains(., "Your order # is:")]'; |
122 | 122 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | ) |
47 | 47 | ); |
48 | 48 | } catch (\Exception $e) { |
49 | - throw new NoSuchShippingMethodException('Unable to find the shipping method: ' . $this->name); |
|
49 | + throw new NoSuchShippingMethodException('Unable to find the shipping method: '.$this->name); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | // Some products, such as virtual products, do not get shipped |