zamknięte

app/controllers/product_controller.rb

@@ -12,7 +12,11 @@ class ProductController < ShopController
   def show
     @product = Product.where('slug = ?', params[:id]).first
     raise_404(@product)
-    render layout: false
+    respond_to do |format|
+      format.html
+      format.js
+    end
+
   end
 
   private

app/controllers/ps_admin/all_page_controller.rb

@@ -90,7 +90,7 @@ module PsAdmin
       unless (@published_page = @all_page.published_page
              )
         @published_page = PublishedPage.new
-        @published_page.priority = PublishedPage.all.size + 1
+        @published_page.priority = PublishedPage.all.count + 1
         @published_page.created_by = current_admin.id
         @published_page.created_at = Time.now
       end

app/controllers/ps_admin/articles/all_page_controller.rb

@@ -90,7 +90,7 @@ module PsAdmin
             @published_page.small_text = @all_page.small_text
             @published_page.full_text = @all_page.full_text
             @published_page.article_id = @all_page.article_id
-            @published_page.priority = PublishedPage.all.size + 1;
+            @published_page.priority = PublishedPage.all.count + 1
             @published_page.updated_by = current_admin.id
             @published_page.updated_at = Time.now
             @published_page.created_by = current_admin.id

app/controllers/ps_admin/image_controller.rb

@@ -13,11 +13,11 @@ module PsAdmin
       params[:images].each do |image|
         if @product.images.blank?
           @product.images.create(image: image, updated_by: current_admin.id,
-                                 position: @product.images.size + 1,
+                                 position: @product.images.count + 1,
                                  cover: true)
         else
           @product.images.create(image: image, updated_by: current_admin.id,
-                                 position: @product.images.size + 1)
+                                 position: @product.images.count + 1)
         end
       end
     end

app/controllers/ps_admin/order_controller.rb

@@ -25,6 +25,12 @@ module PsAdmin
       set_orders
     end
 
+    def gen_pdf_file
+      otp = OrderToPdf.new(@order)
+
+      send_data otp.call, filename: otp.file_name
+    end
+
     def status_histories
       render layout: false
     end

app/controllers/ps_admin/product_controller.rb

@@ -34,11 +34,11 @@ module PsAdmin
           params[:images].each do |image|
             if @product.images.blank?
               @product.images.create(image: image, updated_by: current_admin.id,
-                                     position: @product.images.size + 1,
+                                     position: @product.images.count + 1,
                                      cover: true)
             else
               @product.images.create(image: image, updated_by: current_admin.id,
-                                     position: @product.images.size + 1)
+                                     position: @product.images.count + 1)
             end
           end
         end

app/helpers/application_helper.rb

@@ -19,7 +19,7 @@ module ApplicationHelper
     ret = ''
     categories.each do |node|
       ret += '<li>'
-      size = node.active_childrens.size
+      size = node.active_childrens.count
       if size.zero?
         ret += link_to(node.name, category_path(node))
       else

app/views/cart/add_to_cart.js.erb

@@ -1,3 +1,3 @@
 $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>");
-$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)");
+$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)");
 $.notify('<%= @message[1] %>', '<%= @message[0] %>');

app/views/cart/clear.js.erb

@@ -1,4 +1,4 @@
 $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>");
-$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)");
+$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)");
 $("#ps_cart_summary_items").html("<%= escape_javascript(render('/cart/partials/cart_summary_products')) %>");
 $.notify("Koszyk został wyczyszczony", "warn");

app/views/cart/remove_from_cart.js.erb

@@ -1,5 +1,5 @@
 $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>");
-$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)");
+$('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)");
 <% if params[:ca] == 'cart' %>
 $("#ps_cart_summary_items").html("<%= escape_javascript(render(partial: '/cart/partials/cart_summary_products', locals: { ca: 'cart' })) %>");
 <% elsif params[:ca] == 'order' %>

app/views/category/show.html.erb

@@ -1,5 +1,5 @@
 <%= render '/product/partials/product_modal' %>
-<% if @category.active_childrens.size > 0 %>
+<% if @category.active_childrens.count > 0 %>
   <div class="title-wrap">
     <h2 class="title lines">Kategorie</h2>
   </div>
@@ -37,7 +37,7 @@
     </div>
   <% end %>
 <% end %>
-<% if @products.size > 0 %>
+<% if @products.count > 0 %>
   <div class="title-wrap">
     <h2 class="title lines">Produkty</h2>
   </div>

app/views/checkout/end_order.js.erb

@@ -1,10 +1,10 @@
 <% if @order_complete.eql?(true) %>
   $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>");
-  $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)");
+  $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)");
   $("#main_container").html("<%= escape_javascript(render(partial: '/checkout/partials/order_confirmation')) %>");
 <% elsif @order_complete.eql?(false) %>
   $("#ps_cart_items").html("<%= escape_javascript(render('/cart/partials/cart_products')) %>");
-  $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.size %>)");
+  $('#ps_cart_size').html("(<%= @cart.blank? ? 0 : @cart.cart_products.count %>)");
   $("#main_container").html("<%= escape_javascript(render(partial: '/checkout/partials/order_error')) %>");
 <% else %>
   $('#error').html("<%= escape_javascript(raw @message[1]) %>");

app/views/checkout/order.html.erb

@@ -4,7 +4,7 @@
   </div>
 </div>
 <hr class="spacer-5"><hr class="spacer-20 no-border">
-<% if @cart.blank? || @cart.cart_products.size == 0 %>
+<% if @cart.blank? || @cart.cart_products.count == 0 %>
 <div class="row">
   <div class="col-sm-12">
     <%= render partial: '/checkout/partials/order_error' %>

app/views/layouts/application.html.erb

@@ -69,7 +69,7 @@
               <a href="javascript:void(0);">
                 <i class="fa fa-shopping-basket mr-5"></i>
                 <span class="hidden-xs">
-                  Koszyk<sup class="text-primary" id="ps_cart_size">(<%= @cart ? @cart.cart_products.size : 0 %>)</sup>
+                  Koszyk<sup class="text-primary" id="ps_cart_size">(<%= @cart ? @cart.cart_products.count : 0 %>)</sup>
                   <i class="fa fa-angle-down ml-5"></i>
                 </span>
               </a>

app/views/newsletter_mailer/news_mail.html.erb

@@ -1,9 +1,9 @@
-<p><span style="font-size: 18px;">Witam,</span><br>
+<p><span style="font-size: 18px;">Dzień dobry,</span><br>
-  <span style="font-size: 18px;">Chcieliśmy poinformować, że w związku z często pojawiającymi się prośbami, wznawiamy <b>sprzedaż wysyłkową</b>.</span><br><br>
+  <span style="font-size: 18px;">Informujemy miłośników kaktusów i innych roślin sukulentycznych że w dniach <b>3 do 6 czerwca w godzinach od 9.00 do 17.00</b> rumska kaktusiarnia będzie dodatkowo otwarta.</span><br><br>
-  <span style="font-size: 18px;">Jeśli są Państwo zainteresowani zapraszamy na naszą stronę internetową:</span><br>
+  <span style="font-size: 18px;">Zapraszamy do oglądania obficie kwitnących roślin i powiększenia swojej kolekcji.<br />
+A tych których nie będziemy mogli u nas powitać zapraszamy do naszego sklepu internetowego w którym powiększyliśmy listę roślin do sprzedaży wysyłkowej.</span><br>
   <a href="https://katalogproduktow.kaktusiarnia.pl" target="_blank"><span style="font-size: 18px;">katalogproduktow.kaktusiarnia.pl</span></a><br><br>
-  <span style="font-size: 18px;">Również chcielibyśmy zaprosić Państwa do odwiedzenia naszej hodowli, gdzie na miejscu zobaczyć można kwitnące kaktusy i inne sukulenty oraz nabyć egzemplarze roślin nieobjętych sprzedażą wysyłkową.</span></p>
+  <p><span style="font-size: 18px;"><span style="font-weight: bold;"><span style="color: rgb(57, 123, 33);">Zapraszamy<br />od pon. do pt. w godzinach 9 – 17<br />w soboty w godzinach 9 – 15<br /></span>
-  <p><span style="font-size: 18px;"><span style="font-weight: bold;"><span style="color: rgb(57, 123, 33);">Zapraszamy<br />od pon. do pt. w godzinach 9 – 17<br />w soboty w godzinach 9 – 15</span></span><br></span>
   <br><br><span style="font-size: 18px;">Pozdrawiam,</span><br>
   <span style="font-size: 18px;">Andrzej Hinz<br />512-459-225<br /><a href="https://kaktusiarnia.pl" target="_blank"><span style="font-size: 18px;">kaktusiarnia.pl</span></a></span>
 </p><p><img style="width: 260px;" src="https://katalogproduktow.kaktusiarnia.pl/assets/logo_kaktusiarnia-690ae33f27800d5020d0c5c79fa6327ceb4ee14a8f5005c322948d01389a9d80.png"><br></p>

app/views/newsletter_mailer/news_mail.text.erb

@@ -1,15 +1,18 @@
-Witam,
+Dzień dobry,
-Chcieliśmy poinformować, że w związku z często pojawiającymi się prośbami, wznawiamy sprzedaż wysyłkową.
+Informujemy miłośników kaktusów i innych roślin sukulentycznych że w dniach 3 do 6 czerwca w godzinach od 9.00 do 17.00. rumska kaktusiarnia będzie dodatkowo otwarta.
 
-Jeśli są Państwo zainteresowani zapraszamy na naszą stronę internetową:
+Zapraszamy do oglądania obficie kwitnących roślin i powiększenia swojej kolekcji .
+A tych których nie będziemy mogli u nas powitać zapraszamy do naszego sklepu internetowego w którym powiększyliśmy listę roślin do sprzedaży wysyłkowej.
 katalogproduktow.kaktusiarnia.pl
 
-Również chcielibyśmy zaprosić Państwa do odwiedzenia naszej hodowli, gdzie na miejscu zobaczyć można kwitnące kaktusy i inne sukulenty oraz nabyć egzemplarze roślin nieobjętych sprzedażą wysyłkową.
-
 Zapraszamy
 od pon. do pt. w godzinach 9 – 17
 w soboty w godzinach 9 – 15
 
+dodatkowo otwarte
+w dniach od 3 do 6 czerwca
+w godzinach od 9 do 17
+
 Pozdrawiam,
 Andrzej Hinz
 512-459-225

app/views/product/partials/_index.html.erb

@@ -1,5 +1,5 @@
 <%= render '/product/partials/product_modal' %>
-<% if @products.size > 0 %>
+<% if @products.count > 0 %>
   <div class="title-wrap">
     <h2 class="title lines">Produkty</h2>
   </div>

app/views/product/partials/_products_thumbnails.html.erb

@@ -9,20 +9,20 @@
           <div class="header">
             <figure style="min-height:338px; background-color: white;">
               <% if !product.images.blank? %>
-                <%= link_to(image_tag(product.cover_image.image.url(:large), style: 'margin: auto;vertical-align: middle;display: inline-block;'), {controller: :product, action: :show, id: product.slug}, 'data-toggle': 'modal', 'data-target': ".productQuickView",
+                <%= link_to(image_tag(product.cover_image.image.url(:large), style: 'margin: auto;vertical-align: middle;display: inline-block;'), {controller: :product, action: :show, id: product.slug}, remote: true, 'data-toggle': 'modal', 'data-target': ".productQuickView",
                 style: 'line-height: 338px;') %>
               <% else %>
-                <%= link_to(image_tag('kaktus.png'), {controller: :product, action: :show, id: product.slug}, 'data-toggle': 'modal', 'data-target': ".productQuickView") %>
+                <%= link_to(image_tag('kaktus.png'), {controller: :product, action: :show, id: product.slug}, remote: true, 'data-toggle': 'modal', 'data-target': ".productQuickView") %>
               <% end %>
             </figure>
             <div class="icons">
-              <%= raw link_to(raw('<i class="fa fa-search"></i>'), {controller: :product, action: :show, id: product.slug}, class: 'icon', 'data-toggle': 'modal', 'data-target': ".productQuickView") %>
+              <%= raw link_to(raw('<i class="fa fa-search"></i>'), {controller: :product, action: :show, id: product.slug}, remote: true, class: 'icon', 'data-toggle': 'modal', 'data-target': ".productQuickView") %>
               <a class="icon" href="" onclick="addToCart(event,'<%= product.slug %>');">
                 <i class="fa fa-cart-plus mr-5"></i>Dodaj do koszyka</a>
             </div>
           </div>
           <div class="caption">
-            <h6 class="regular"><%= link_to(product.name, {controller: :product, action: :show, id: product.slug}, 'data-toggle': 'modal', 'data-target': ".productQuickView") %></h6>
+            <h6 class="regular"><%= link_to(product.name, {controller: :product, action: :show, id: product.slug}, remote: true, 'data-toggle': 'modal', 'data-target': ".productQuickView") %></h6>
             <div class="price">
               <span class="amount text-primary">PLN
                 <%= '%.2f' % product.price %></span>

app/views/product/partials/_show.html.erb

@@ -0,0 +1,97 @@
+<div class="modal-dialog modal-lg" role="document">
+  <div class="modal-content">
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">×</span>
+      </button>
+      <h5><%= @product.name %></h5>
+    </div>
+    <!-- end modal-header -->
+    <div class="modal-body">
+      <div class="row">
+        <div class="col-sm-5">
+          <div class="carousel slide product-slider" data-ride="carousel" data-interval="false">
+            <div class="carousel-inner">
+              <% if @product.images.blank? %>
+                <div class="item active">
+                  <figure>
+                    <%= image_tag 'kaktus.png' %>
+                  </figure>
+                </div>
+              <% else %>
+                <% test = 0 %>
+                  <% @product.images.order('position').each do |image| %>
+                    <div class="item<%= test == 0 ? ' active' : '' %>">
+                      <figure>
+                        <%= image_tag image.image.url(:thickbox) %>
+                      </figure>
+                    </div>
+                    <% test = 1 %><% end %>
+                  <% end %>
+
+                  <!-- Arrows -->
+                  <a class="left carousel-control" href=".product-slider" data-slide="prev">
+                    <span class="fa fa-angle-left"></span>
+                  </a>
+                  <a class="right carousel-control" href=".product-slider" data-slide="next">
+                    <span class="fa fa-angle-right"></span>
+                  </a>
+                </div>
+                <!-- end carousel-inner -->
+
+                <!-- thumbs -->
+                <ol class="carousel-indicators mCustomScrollbar meartlab">
+                  <% if @product.images.blank? %>
+                    <li data-target=".product-slider" data-slide-to="0" class="active"><%= image_tag 'kaktus.png' %></li>
+                  <% else %>
+                    <% test = 0 %>
+                      <%  @product.images.order('position').each do |image| %>
+                        <li data-target=".product-slider" data-slide-to="<%= test %>" <%= raw test == 0 ? ' class="active"' : '' %>><%= image_tag image.image.url(:medium) %></li>
+                        <% test += 1 %><% end %>
+                      <% end %>
+                    </ol>
+                    <!-- end carousel-indicators -->
+                  </div>
+                  <!-- end carousel -->
+                </div>
+                <!-- end col -->
+                <div class="col-sm-7">
+                  <p class="text-gray alt-font">
+                    <strong>Kategoria:</strong>
+                    <%= @product.default_category.name %></p>
+                  <h4 class="text-primary">PLN
+                    <%= '%.2f' % @product.price %></h4>
+                  <p><%= raw @product.description %></p>
+                  <hr class="spacer-10">
+                  <div class="row">
+                    <div class="col-md-2 col-sm-4">
+                      Ilość:
+                    </div>
+                    <div class="col-md-4 col-sm-8">
+                      <select class="form-control" name="select" id="product_qty">
+                        <% for i in 1..@product.max_qty %>
+                          <option value="<%= i %>"><%= i %></option>
+                        <% end %>
+                      </select>
+                    </div>
+                    <!-- end col -->
+
+                  </div>
+                  <!-- end row -->
+                  <hr class="spacer-10">
+                  <ul class="list list-inline">
+                    <li>
+                      <button type="button" class="btn btn-default btn-md round" onclick="addToCart(event, '<%= @product.slug %>', '#product_qty');">
+                        <i class="fa fa-shopping-basket mr-5"></i>Dodaj do koszyka</button>
+                    </li>
+                  </ul>
+                </div>
+                <!-- end col -->
+              </div>
+              <!-- end row -->
+            </div>
+            <!-- end modal-body -->
+          </div>
+          <!-- end modal-content -->
+        </div>
+        <!-- end modal-dialog -->

app/views/product/show.js.erb

@@ -0,0 +1,2 @@
+$('.productQuickView').html("<%= j render '/product/partials/show' %>");
+$('.productQuickView').modal('show');

app/views/ps_admin/article/_articles.html.erb

@@ -16,8 +16,8 @@
       <% for ap in @articles %>
       <tr>
         <td><%= link_to ap.name, {controller: '/ps_admin/article', action: 'show', id: ap.id} %></td>
-        <td><%= raw('<span class="badge bg-yellow">' + ap.all_page_articles.size.to_s + '</span>') %></td>
+        <td><%= raw('<span class="badge bg-yellow">' + ap.all_page_articles.count.to_s + '</span>') %></td>
-        <td><%= raw('<span class="badge bg-green">' + ap.published_page_articles.size.to_s + '</span>') %></td>
+        <td><%= raw('<span class="badge bg-green">' + ap.published_page_articles.count.to_s + '</span>') %></td>
         <td><%= ap.updated_at %></td>
         <td>
           <%= link_to raw('<i class="fa fa-edit"></i> Edycja'), {controller: '/ps_admin/article', action: 'edit', id: ap.id}, class: 'btn btn-xs btn-info', remote: true %>

app/views/ps_admin/category/_categories.html.erb

@@ -28,9 +28,9 @@
           <% end %>
         </td>
         <td><%= link_to cat.name, {controller: '/ps_admin/category', action: 'index', parent_id: cat.id} %></td>
-        <td><%= raw('<span class="badge bg-green">' + cat.children.size.to_s + '</span>') %></td>
+        <td><%= raw('<span class="badge bg-green">' + cat.children.count.to_s + '</span>') %></td>
-        <td><%= raw('<span class="badge bg-green">' + cat.products.size.to_s + '</span>') %></td>
+        <td><%= raw('<span class="badge bg-green">' + cat.products.count.to_s + '</span>') %></td>
-        <td><%= raw('<span class="badge bg-' + (cat.active_products.size == 0 ? 'red' : 'green') + '">' + cat.active_products.size.to_s + '</span>') %></td>
+        <td><%= raw('<span class="badge bg-' + (cat.active_products.count == 0 ? 'red' : 'green') + '">' + cat.active_products.count.to_s + '</span>') %></td>
         <td><%= raw cat.active.eql?(true) ? link_to(raw('<i class="fa fa-eye text-green"></i>'), {controller: '/ps_admin/category', action: 'set_active', id: cat.id,
           active: 0}, remote: true) : link_to(raw('<i class="fa fa-eye-slash text-red"></i>'),
           {controller: '/ps_admin/category', action: 'set_active', id: cat.id, active: 1}, remote: true) %></td>

app/views/ps_admin/image/partials/_images.html.erb

@@ -21,7 +21,7 @@
               <% else %>
                 <%= link_to raw('<i class="fa fa-caret-square-o-up"></i>'), {controller: '/ps_admin/image', action: 'pos_up', id: image.id, product_id: @product.id}, class: 'btn btn-xs btn-success', remote: true, title: 'Do góry' %>
               <% end %>
-              <% if image.position >= @product.images.size %>
+              <% if image.position >= @product.images.count %>
                 <%= link_to raw('<i class="fa fa-caret-square-o-down"></i>'), '#', class: 'btn btn-xs btn-primary', remote: true, title: 'W dół', disabled: 'disabled' %>
               <% else %>
                 <%= link_to raw('<i class="fa fa-caret-square-o-down"></i>'), {controller: '/ps_admin/image', action: 'pos_down', id: image.id, product_id: @product.id}, class: 'btn btn-xs btn-primary', remote: true, title: 'W dół' %>

app/views/ps_admin/order/partials/_show.html.erb

@@ -62,6 +62,8 @@
           <dd><%= @order.payment_method.name %></dd>
           <dt>Wiadomość</dt>
           <dd><%= raw @order.message_from_client.gsub(/(\r\n|\n\r|\r|\n)/, '<br \>') unless @order.message_from_client.blank? %></dd>
+          <dt>PDF:</dt>
+          <dd><%= link_to raw('Pobierz PDF'), {controller: '/ps_admin/order', action: :gen_pdf_file, id: @order.id}, class: 'btn btn-info btn-xs' %></dd>
         </dl>
       </div>
     </div>

config/routes.rb

@@ -39,6 +39,7 @@ Rails.application.routes.draw do
     resources :settings
     resources :admins
     get 'order/anonimize'
+    get 'order/gen_pdf_file'
     get 'order/status_histories'
     get 'order/change_status'
     resources :order

public/closed.html

@@ -31,8 +31,8 @@
                     <div class="row">
                         <div class="col-sm-6 col-sm-offset-3 text-center">
                             <h1 class="text-warning alt-font" style="font-size: 10em;">Zamknięte</h1>
-                            <h2>Sklep nieczynny!</h2>
+                            <h2>Sprzedaż wysyłkowa została zakończona!</h2>
-                            <p class="lead">Przepraszamy. Proszę wrócić kiedy indziej.</p>
+                            <p class="lead">Zapraszamy do odwiedzenia nas w Rumi. <a href="https://kaktusiarnia.pl">https://kaktusiarnia.pl</a></p>
                         </div><!-- end col -->
                     </div><!-- end row -->
                 </div><!-- end container -->