Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.10.60

OpenMage · Mar 29, 2024 · 845a699 · 845a699
2 parents bcc80b1 + 1197c2b
commit 845a699
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 186 deletions.
diff --git a/app/code/core/Mage/Sales/etc/wsdl.xml b/app/code/core/Mage/Sales/etc/wsdl.xml
@@ -275,6 +275,11 @@
                     <element name="middlename" type="xsd:string" minOccurs="0" />
                     <element name="lastname" type="xsd:string" minOccurs="0" />
                     <element name="company" type="xsd:string" minOccurs="0" />
+                    <element name="vat_id" type="xsd:string" minOccurs="0" />
+                    <element name="vat_is_valid" type="xsd:string" minOccurs="0" />
+                    <element name="vat_request_id" type="xsd:string" minOccurs="0" />
+                    <element name="vat_request_date" type="xsd:string" minOccurs="0" />
+                    <element name="vat_request_success" type="xsd:string" minOccurs="0" />
                     <element name="street" type="xsd:string" minOccurs="0" />
                     <element name="city" type="xsd:string" minOccurs="0" />
                     <element name="region" type="xsd:string" minOccurs="0" />

diff --git a/app/code/core/Mage/Sales/etc/wsi.xml b/app/code/core/Mage/Sales/etc/wsi.xml
@@ -276,6 +276,11 @@
                     <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
                     <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
                     <xsd:element name="company" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="vat_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="vat_is_valid" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="vat_request_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="vat_request_date" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="vat_request_success" type="xsd:string" minOccurs="0" />
                     <xsd:element name="street" type="xsd:string" minOccurs="0" />
                     <xsd:element name="city" type="xsd:string" minOccurs="0" />
                     <xsd:element name="region" type="xsd:string" minOccurs="0" />

diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml
@@ -28,7 +28,7 @@
     }
 ?>
 
-<a href="<?php echo $this->helper('checkout/cart')->getCartUrl(); ?>" data-target-element="#header-cart" class="skip-link skip-cart <?php if($_cartQty <= 0): ?> no-count<?php endif ?>">
+<a href="<?php echo $this->helper('checkout/cart')->getCartUrl(); ?>" data-target-element="#header-cart" class="skip-link skip-cart <?php if($_cartQty <= 0): ?> no-count<?php endif ?>" title="<?php echo $this->__('Cart'); ?>">
     <span class="icon"></span>
     <span class="label"><?php echo $this->__('Cart'); ?></span>
     <span class="count"><?php echo $_cartQty; ?></span>

diff --git a/app/design/frontend/rwd/default/template/page/html/header.phtml b/app/design/frontend/rwd/default/template/page/html/header.phtml
@@ -48,13 +48,13 @@
                 <span class="label"><?php echo $this->__('Menu'); ?></span>
             </a>
 
-            <a href="#header-search" class="skip-link skip-search">
+            <a href="#header-search" class="skip-link skip-search" title="<?php echo $this->__('Search'); ?>">
                 <span class="icon"></span>
                 <span class="label"><?php echo $this->__('Search'); ?></span>
             </a>
 
             <div class="account-cart-wrapper">
-                <a href="<?php echo $this->helper('customer')->getAccountUrl(); ?>" data-target-element="#header-account" class="skip-link skip-account">
+                <a href="<?php echo $this->helper('customer')->getAccountUrl(); ?>" data-target-element="#header-account" class="skip-link skip-account" title="<?php echo $this->__('Account'); ?>">
                     <span class="icon"></span>
                     <span class="label"><?php echo $this->__('Account'); ?></span>
                 </a>