Merge pull request #151 from nebulab/mfrecchiami/move_price_under_pro…

…duct_info Move price under product info
solidusio · Mar 23, 2021 · 7685a28 · 7685a28
2 parents b9806fc + 422a33d
commit 7685a28
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/app/assets/stylesheets/spree/frontend/components/products/_product_price.scss b/app/assets/stylesheets/spree/frontend/components/products/_product_price.scss
@@ -0,0 +1,3 @@
+.product-price {
+  font-size: $h4-font-size;
+}
diff --git a/app/assets/stylesheets/spree/frontend/components/products/_product_submit.scss b/app/assets/stylesheets/spree/frontend/components/products/_product_submit.scss
@@ -1,7 +1,3 @@
 .product-submit {
   margin: 0 0 3rem;
-
-  &__title {
-    font-size: $h4-font-size;
-  }
 }
diff --git a/app/assets/stylesheets/spree/frontend/screen.scss b/app/assets/stylesheets/spree/frontend/screen.scss
@@ -79,6 +79,7 @@
 @import 'spree/frontend/components/products/product_image';
 @import 'spree/frontend/components/products/product_info';
 @import 'spree/frontend/components/products/product_page';
+@import 'spree/frontend/components/products/product_price';
 @import 'spree/frontend/components/products/product_properties';
 @import 'spree/frontend/components/products/product_submit';
 @import 'spree/frontend/components/products/product_taxons';

diff --git a/app/views/spree/components/products/_product_info.html.erb b/app/views/spree/components/products/_product_info.html.erb
@@ -3,6 +3,8 @@
     <%= @product.name %>
   </h1>
 
+  <%= render 'spree/components/products/product_price', product: @product %>
+
   <p class="product-info__description" itemprop="description">
     <%= product_description(@product) rescue t('spree.product_has_no_description') %>
   </p>

diff --git a/app/views/spree/components/products/_product_price.html.erb b/app/views/spree/components/products/_product_price.html.erb
@@ -0,0 +1,16 @@
+<% if @product.price_for(current_pricing_options) and [email protected]? %>
+  <h2 class="product-price" id="product-price">
+    <%= content_tag(
+      :span,
+      display_price(@product),
+      itemprop: 'price',
+      content: @product.price_for(current_pricing_options).to_d,
+      data: { js: 'price' }
+    ) %>
+
+    <span
+      itemprop="priceCurrency"
+      content="<%= current_pricing_options.currency %>"
+    ></span>
+  </h2>
+<% end %>
diff --git a/app/views/spree/components/products/_product_submit.html.erb b/app/views/spree/components/products/_product_submit.html.erb
@@ -1,18 +1,4 @@
-<div class="product-submit" id="product-price">
-  <h2 class="product-submit__title">
-    <%= content_tag(
-      :span,
-      display_price(@product),
-      itemprop: 'price',
-      content: @product.price_for(current_pricing_options).to_d,
-      data: { js: 'price' }
-    ) %>
-    <span
-      itemprop="priceCurrency"
-      content="<%= current_pricing_options.currency %>"
-    ></span>
-  </h2>
-
+<div class="product-submit">
   <%= render 'spree/components/products/product_availability', product: @product %>
 
   <div class="horizontal-input-group">