wait #7330 @2:00

diff --git a/wp-content/themes/physioassist/resources/assets/styles/common/app.styl b/wp-content/themes/physioassist/resources/assets/styles/common/app.styl
index a38718ea0d694ecc80031dc12a1d5bc99b8a0074..0be6a4fd3c4b8e2c0b36af43afbbd62174d6167e 100644 (file)
--- a/wp-content/themes/physioassist/resources/assets/styles/common/app.styl
+++ b/wp-content/themes/physioassist/resources/assets/styles/common/app.styl
@@ -3,9 +3,11 @@
     font-family: $fontOutfit
   p,h1,h2,h3,h4,h5,h6,span,label,div
     color: #1B2943
+    line-height: normal
 
   .content-inner
     horizontal-spacing(16px)
+    padding-top: 0
 
   .elementor-section.elementor-section-boxed > .elementor-container
     padding: 0
@@ -21,11 +23,37 @@
   .woocommerce-cart-form .product-price,
   &.woocommerce div.product .woocommerce-tabs ul.tabs .additional_information_tab,
   .woocommerce-info,
-  .woocommerce-notice
+  .woocommerce-notice,
+  .woocommerce-notices-wrapper,
+  .woocommerce-shipping-calculator,
+  .woocommerce-billing-fields h3
     display: none
 
+  // Container
+  body .wrap.container
+    padding-top: 0 !important
+
+  // Header
+  header.mobileapp
+    padding: 27px
+    text-align: center
+    border-bottom: 1px solid #E3E4E7
+    position: relative
+    h1
+      font-size: 20px
+      font-weight: $semibold
+    button
+      position: absolute
+      right: 18px
+      top: 50%
+      transform: translateY(-50%)
+      svg
+        width: 17px
+        color: #1B2943
+
   // Single product
   div.product
+    padding-top: 28px
     .woocommerce
       &-product-gallery
         display: flex
@@ -39,6 +67,8 @@
           overflow: hidden
           [data-thumb]:not(:first-child)
             display: none
+      &-price-suffix
+        font-size: 22px
       &-product-title__wrapper
         h1,.price
           font-size: 22px
@@ -59,6 +89,9 @@
         p
           font-size: 18px
 
+    .label-quantity
+      margin-bottom: 9px
+
   .woocommerce
     div.product .woocommerce
       &-tabs
@@ -85,7 +118,7 @@
         margin-top: -10px
 
     .qib-container
-      margin-bottom: 15px
+      margin-bottom: 24px
 
   form.cart
     display: flex
@@ -127,8 +160,12 @@
 
   //
   .wps_sfw_subscription_wrapper
-    margin-top: 8px
+    margin-top: 11px
     margin-bottom: 20px
+    label
+      font-size: 18px
+  .wps_wsp_onetimesimple_wrapper
+    margin-bottom: 6px
 
   // Radio button
   input[type=radio]
@@ -237,6 +274,9 @@
       .label
         margin-right: auto
 
+    small
+      font-size: 18px
+
   .woocommerce-shipping-totals
     padding-bottom: 16px
     margin-bottom: 24px
@@ -252,12 +292,16 @@
       &:after
         display: none
 
+  //
+  .woocommerce-shipping-destination
+    margin-top: 16px
+
   // Global style
   .woocommerce-cart
     &-summary-card
       border-radius: 15px
-      padding: 23px 16px
       white-box(15px)
+      padding: 23px 16px
       .label
         font-weight: 600
 
@@ -293,6 +337,9 @@
   .woocommerce ul#shipping_method li
     margin-bottom: 3px
 
+  .woocommerce-shipping-fields
+    margin-bottom: 8px
+
   .woocommerce-billing-fields__field-wrapper,
   .woocommerce-shipping-fields__field-wrapper,
   .woocommerce-checkout-payment-box
@@ -300,27 +347,40 @@
       width: 100%
 
   .wc-stripe-elements-field
+    white-box(28px)
     padding: 17.7px
-    border-radius: 28px
+    border: 0
+    input::placeholder
+      color: #8E94A1
 
-  .input-text
+  .input-text,#billing_country_field span,#shipping_country_field span
     font-weight: 300
+    border: 0 !important
     &::placeholder
       color: #8E94A1
-    &:not(textarea)
+    &:not(textarea):not(.qty)
       white-box(28px)
 
   textarea.input-text
     white-box(24px)
 
+  #billing_country_field span,
+  #shipping_country_field span
+    display: block
+    strong
+      font-weight: 300
+
   .woocommerce form .form-row label
     text-transform: initial
     color: #1B2943
     font-weight: $regular
     font-size: 16px
-    margin: 4px 10px
-  .woocommerce form .form-row .required
-    color: #1B2943
+    margin: 4px 10px 8px
+    line-height: normal
+  .woocommerce form .form-row
+    margin: 0 0 16px
+    .required
+      color: #1B2943
   .woocommerce #ship-to-different-address
     font-size: 16px
     label
@@ -329,12 +389,12 @@
     input
       margin-right: 8px
   .woocommerce-additional-fields
-    padding-bottom: 24px
+    padding-bottom: 8px
     margin-bottom: 24px
     border-bottom: 1px solid #E3E4E7
 
   #order_review_heading
-    margin-bottom: 6px
+    margin-bottom: 16px
 
   .woocommerce-checkout-payment-box
     background-color: #EAF1F8
@@ -380,20 +440,27 @@
 
   body.validation
     font-size: 16px
+    .woocommerce
+      padding-top: 28px
     h3
       font-size: 22px
       font-weight: $semibold
       color: #1B2943
     .woocommerce-cart-summary-card
       font-size: 18px
+      .product-name
+        max-width: 188px
+        font-weight: 600
+        margin-bottom: 8px
       .quantity, small
         font-size: 16px
       .order-total
         font-size: 22px
+      h4,ul:not(.woocommerce-shipping-methods)
+        display: none
 
   .woocommerce-order-overview
     white-box(15px)
-    padding: 16px 24px
 
   .woocommerce-thankyou-order-message
     stroke-dasharray: 1000
@@ -405,6 +472,9 @@
       max-width: 240px
       margin: 0 auto 24px
       line-height: normal
+    .subtitle
+      max-width: 327px
+      margin: 15px auto 0
 
   .woocommerce ul.order_details li
     float: none

diff --git a/wp-content/themes/physioassist/resources/assets/styles/common/mixins.styl b/wp-content/themes/physioassist/resources/assets/styles/common/mixins.styl
index 625b5533abca71b8e520b0ecce86693002afee16..4e390bcdbe2ae00f4bfe1b5bca071eb25c5f2652 100644 (file)
--- a/wp-content/themes/physioassist/resources/assets/styles/common/mixins.styl
+++ b/wp-content/themes/physioassist/resources/assets/styles/common/mixins.styl
@@ -105,8 +105,8 @@ white-box(r)
   background-color: #fff
   border: 1px solid #E3E4E7
   border-radius: r
-  box-shadow: 0 3px 6px #ECF2F8
-  padding: 16px 24px
+  box-shadow: 0 3px 6px #ECF2F8 !important
+  padding: 24px 16px
 
 line()
   border-bottom: 1px solid #E3E4E7

diff --git a/wp-content/themes/physioassist/resources/assets/styles/common/utilities.styl b/wp-content/themes/physioassist/resources/assets/styles/common/utilities.styl
index e2ceb03d4b25081f3d4d857fcf0822c5dac846ac..4dbaad7df4ebfd4c1875d17170f2db17eae2f9b8 100644 (file)
--- a/wp-content/themes/physioassist/resources/assets/styles/common/utilities.styl
+++ b/wp-content/themes/physioassist/resources/assets/styles/common/utilities.styl
@@ -13,4 +13,19 @@
 .text-xs
   font-size: 12px
 
+.flex-between
+  display: flex
+  justify-content: space-between
+
+.semibold
+  font-weight: $semibold
+
+.grey-label
+  font-size: 16px !important
+  font-weight: $regular
+  color: #8E94A1 !important
+
+.shrink-0
+  flex-shrink: 0
+
 //.indent-content // See sections.styl

diff --git a/wp-content/themes/physioassist/resources/views/partials/header-mobileapp.blade.php b/wp-content/themes/physioassist/resources/views/partials/header-mobileapp.blade.php
new file mode 100644 (file)
index 0000000..47fb2c1
--- /dev/null
+++ b/wp-content/themes/physioassist/resources/views/partials/header-mobileapp.blade.php
@@ -0,0 +1,16 @@
+<header class="mobileapp">
+  <h1>
+    @if(in_array( 'single-product', get_body_class()))
+      Commander des filtres
+    @elseif(is_page('Panier'))
+      Votre panier
+    @elseif(in_array('woocommerce-order-received', get_body_class()))
+      Votre commande
+    @elseif(is_page('Validation'))
+      Détails de facturation
+    @endif
+  </h1>
+  <button id="return-to-main">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17.847 17.847"><path fill-rule="evenodd" clip-rule="evenodd" fill="currentcolor" d="M11.044 8.923l6.363-6.363A1.5 1.5 0 1015.286.439L8.923 6.802 2.56.439a1.501 1.501 0 00-2.121 0 1.501 1.501 0 000 2.121l6.363 6.363-6.363 6.363a1.5 1.5 0 102.121 2.121l6.363-6.363 6.363 6.363a1.5 1.5 0 102.121-2.121l-6.363-6.363z"/></svg>
+  </button>
+</header>

diff --git a/wp-content/themes/physioassist/resources/views/woocommerce/checkout/thankyou.blade.php b/wp-content/themes/physioassist/resources/views/woocommerce/checkout/thankyou.blade.php
index 5facd6caf0f6ee78628a67efa3d670379cd1d7a7..272e06b9073c739772fd2fdb02de4aca10078b34 100644 (file)
--- a/wp-content/themes/physioassist/resources/views/woocommerce/checkout/thankyou.blade.php
+++ b/wp-content/themes/physioassist/resources/views/woocommerce/checkout/thankyou.blade.php
@@ -41,8 +41,12 @@ defined( 'ABSPATH' ) || exit;
     <?php else : ?>
 
       <?php wc_get_template( 'checkout/order-received.php', array( 'order' => $order ) ); ?>
+
+  <?php
+    $app = filter_input(INPUT_GET, 'app', FILTER_SANITIZE_STRING);
+    if($app == "true"){ ?>
     <div class="woocommerce-thankyou-order-message">
-      <h3><?php esc_html_e('Votre commande est enregistrée', 'woocommerce'); ?></h3>
+      <h3><?php esc_html_e('Votre commande est enregistrée !', 'woocommerce'); ?></h3>
       <div class="valid">
         <svg xmlns="http://www.w3.org/2000/svg" width="110" height="110" viewBox="0 0 110 110">
           <g id="Groupe_4" data-name="Groupe 4" transform="translate(-133 -195)">
@@ -51,8 +55,67 @@ defined( 'ABSPATH' ) || exit;
           </g>
         </svg>
       </div>
-      <p><?php esc_html_e('Nous vous remercions pour votre commande.', 'woocommerce'); ?></p>
+      <p class="subtitle"><?php esc_html_e('Nous vous remercions pour votre commande.', 'woocommerce'); ?></p>
     </div>
+  <ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
+
+    <li class="woocommerce-order-overview__order order">
+        <?php esc_html_e( 'N° de la commande', 'woocommerce' ); ?>
+      <strong><?php echo $order->get_order_number(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></strong>
+    </li>
+
+    <li class="woocommerce-order-overview__date date">
+        <?php esc_html_e( 'Date de la commande', 'woocommerce' ); ?>
+      <strong><?php echo strftime("%d/%m/%y", strtotime($order->get_date_created())); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></strong>
+    </li>
+
+      <?php if ( is_user_logged_in() && $order->get_user_id() === get_current_user_id() && $order->get_billing_email() ) : ?>
+    <li class="woocommerce-order-overview__email email">
+        <?php esc_html_e( 'Email', 'woocommerce' ); ?>
+      <strong><?php echo $order->get_billing_email(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></strong>
+    </li>
+    <?php endif; ?>
+
+    <li class="woocommerce-order-overview__products hide-on-desktop">
+        <?php esc_html_e( 'Product(s)', 'woocommerce' ); ?>
+      <strong>
+        @php
+          $order_items = $order->get_items( apply_filters( 'woocommerce_purchase_order_item_types', 'line_item' ) );
+          foreach ( $order_items as $item_id => $item ) {
+            $product = $item->get_product();
+            $is_visible = $product && $product->is_visible();
+            $product_permalink = apply_filters( 'woocommerce_order_item_permalink', $is_visible ? $product->get_permalink( $item ) : '', $item, $order );
+            echo $item->get_name();
+            $qty          = $item->get_quantity();
+            $refunded_qty = $order->get_qty_refunded_for_item( $item_id );
+
+            if ( $refunded_qty ) {
+              $qty_display = '<del>' . esc_html( $qty ) . '</del> <ins>' . esc_html( $qty - ( $refunded_qty * -1 ) ) . '</ins>';
+            } else {
+              $qty_display = esc_html( $qty );
+            }
+              echo apply_filters( 'woocommerce_order_item_quantity_html', ' <strong class="product-quantity">(' . sprintf( '&times;&nbsp;%s', $qty_display ) . ')</strong>', $item ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+          }
+        @endphp
+      </strong>
+    </li>
+
+    <li class="woocommerce-order-overview__shipping hide-on-desktop">
+      <span class="shrink-0"><?php esc_html_e( 'Mode de livraison', 'woocommerce' ); ?></span>
+      <strong>
+        @php
+          echo $order->get_shipping_method()
+        @endphp
+      </strong>
+    </li>
+
+    <li class="woocommerce-order-overview__total total">
+        <?php esc_html_e( 'Total', 'woocommerce' ); ?>
+      <strong><?php echo $order->get_formatted_order_total(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></strong>
+    </li>
+
+  </ul>
+  <?php }else{ ?>
     <ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 
     <li class="woocommerce-order-overview__order order">
@@ -118,6 +181,7 @@ defined( 'ABSPATH' ) || exit;
     <?php endif; ?>
 
   </ul>
+  <?php } ?>
 
     <?php endif; ?>
     <div class="hide-on-mobileapp">