comable_backend 0.3.2 → 0.3.3

data/app/views/comable/admin/products/_form.slim

@@ -1,95 +1,131 @@
+= error_messages_for @product
+
 - url = comable.admin_products_path if @product.new_record?
 - url ||= comable.admin_product_path(@product)
+
 = form_for @product, url: url, html: { multipart: true } do |f|
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
+  .hidden
+    = f.submit
+
+  fieldset
+    .col-sm-3
+      legend
         = Comable.t('admin.general')
-    .panel-body
-      .form-horizontal
-        .form-group
-          .col-sm-3.control-label
-            = f.label :code
-          .col-sm-6
-            = f.text_field :code
-
-        .form-group
-          .col-sm-3.control-label
-            = f.label :name
-          .col-sm-6
-            = f.text_field :name
-
-        .form-group
-          .col-sm-3.control-label
-            = f.label :caption
-          .col-sm-6
-            = f.text_field :caption
-
-        .form-group
-          .col-sm-3.control-label
-            = f.label :price
-          .col-sm-6
-            = f.text_field :price
-
-        = stylesheet_link_tag 'http://rawgithub.com/aehlke/tag-it/master/css/jquery.tagit.css', media: 'all'
-        = stylesheet_link_tag 'http://rawgithub.com/aehlke/tag-it/master/css/tagit.ui-zendesk.css', media: 'all'
-        = javascript_include_tag 'http://rawgithub.com/aehlke/tag-it/master/js/tag-it.min.js'
-
-        / TODO: Refactoring
-        javascript:
-          comable_tagit_available_tags = #{raw Comable::Category.all.map(&:path).map { |path| path.map(&:name).join(' > ') }.sort.to_json};
-        coffee:
-          $(document).ready(->
-            $("#comable-tagit").tagit({
-              fieldName: 'product[category_path_names][]',
-              availableTags: comable_tagit_available_tags,
-              autocomplete: { delay: 0, minLength: 0 },
-              showAutocompleteOnFocus: true,
-              removeConfirmation: true,
-              # Only allow available tags
-              beforeTagAdded: (event, ui) -> (comable_tagit_available_tags.indexOf(ui.tagLabel) != -1)
-            })
-          )
-
-        .form-group
-          .col-sm-3.control-label
-            = f.label :categories
-          .col-sm-6
-            ul#comable-tagit
-              - @product.categories.each do |category|
-                li
-                  = category.path.map(&:name).join(' > ')
-
-        fieldset
-          legend.text-center.text-muted
-            | SKU
-
-          .form-group
-            .col-sm-3.control-label
-              = f.label :sku_h_item_name
-            .col-sm-6
-              = f.text_field :sku_h_item_name
-              span.help-block
-                = Comable.t('admin.please_fill_when_using_sku')
+      .help-block
 
-          .form-group
-            .col-sm-3.control-label
-              = f.label :sku_v_item_name
-            .col-sm-6
-              = f.text_field :sku_v_item_name
+    .col-sm-9
+      .form-group
+        = f.label :code
+        = f.text_field :code
+
+      .form-group
+        = f.label :name
+        = f.text_field :name
+
+      .form-group
+        = f.label :caption
+        = f.text_field :caption
+
+      .form-group
+        = f.label :price
+        = f.text_field :price
+
+      = stylesheet_link_tag 'http://rawgithub.com/aehlke/tag-it/master/css/jquery.tagit.css', media: 'all'
+      = stylesheet_link_tag 'http://rawgithub.com/aehlke/tag-it/master/css/tagit.ui-zendesk.css', media: 'all'
+      = javascript_include_tag 'http://rawgithub.com/aehlke/tag-it/master/js/tag-it.min.js'
+
+      / TODO: Refactoring
+      javascript:
+        comable_tagit_available_tags = #{raw Comable::Category.all.map(&:path).map { |path| path.map(&:name).join(' > ') }.sort.to_json};
+      coffee:
+        $(document).ready(->
+          $("#comable-tagit").tagit({
+            fieldName: 'product[category_path_names][]',
+            availableTags: comable_tagit_available_tags,
+            autocomplete: { delay: 0, minLength: 0 },
+            showAutocompleteOnFocus: true,
+            removeConfirmation: true,
+            # Only allow available tags
+            beforeTagAdded: (event, ui) -> (comable_tagit_available_tags.indexOf(ui.tagLabel) != -1)
+          })
+        )
 
-    .panel-footer
-      = link_to Comable.t('admin.actions.cancel'), comable.admin_products_path, class: 'btn btn-default'
-      .pull-right
-        = f.submit
+      .form-group
+        = f.label :categories
+        ul#comable-tagit
+          - @product.categories.each do |category|
+            li
+              = category.path.map(&:name).join(' > ')
 
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
+  hr
+
+  fieldset
+    .col-sm-3
+      legend
+        = Comable.t('admin.stocks')
+      .help-block
+        - if @product.sku? || (@product.persisted? && @product.stocks.empty?)
+          = Comable.t('admin.link_to_add_new_stock')
+          = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path(@product)
+
+    .col-sm-9
+      - if @product.stocks.any?
+        table.table.table-striped
+          thead
+            th
+              = @product.stocks.human_attribute_name(:code)
+            th
+              = @product.stocks.human_attribute_name(:quantity)
+            - if @product.sku?
+              - if @product.sku_h?
+                th
+                  = @product.sku_h_item_name
+              - if @product.sku_v?
+                th
+                  = @product.sku_v_item_name
+            th
+              = Comable.t('admin.operation')
+          tbody
+            - @product.stocks.each do |stock|
+              tr
+                td
+                  = stock.code
+                td
+                  strong class="#{(stock.quantity <= 0) ? 'text-danger' : (stock.quantity <= 10) ? 'text-warning' : 'text-success'}"
+                    = number_with_delimiter stock.quantity
+                - if @product.sku?
+                  - if @product.sku_h?
+                    td
+                      = stock.sku_h_choice_name
+                  - if @product.sku_v?
+                    td
+                      = stock.sku_v_choice_name
+                td
+                  = link_to comable.admin_stock_path(stock), class: 'btn btn-default'
+                    i.fa.fa-edit>
+                    = Comable.t('admin.actions.edit')
+
+      .form-group
+        = f.label :sku_h_item_name
+        = f.text_field :sku_h_item_name
+        .help-block
+          = Comable.t('admin.please_fill_when_using_sku')
+
+      .form-group
+        = f.label :sku_v_item_name
+        = f.text_field :sku_v_item_name
+
+  hr
+
+  fieldset
+    .col-sm-3
+      legend
         = Comable.t('admin.images')
-    .panel-body
-      - images = @product.images + [@product.images.build]
-      - main_image = images.first
+      .help-block
+
+    .col-sm-9
+      - images = @product.images
+      - main_image = images.first || @product.images.build
       - sub_images = images - [main_image]
 
       .row
@@ -111,20 +147,7 @@
           .row
             - sub_images.each.with_index(1) do |image, index|
               = f.fields_for :images, image do |ff|
-                .col-sm-6
-                  label
-                    | #{Comable.t('admin.sub_image')} ##{index}
-                  p
-                    = ff.file_field :file
-                  - if ff.object.url
-                    .thumbnail
-                      = image_tag ff.object.url
-                      - if ff.object.persisted?
-                        label.remove
-                          span> = ff.check_box :_destroy
-                          span> = Comable.t('admin.actions.destroy')
-
-    .panel-footer
-      = link_to Comable.t('admin.actions.cancel'), comable.admin_products_path, class: 'btn btn-default'
-      .pull-right
-        = f.submit
+                = render 'image_fields', ff: ff, index: index
+
+            .col-sm-6
+              = link_to_add_fields Comable.t('admin.add_sub_image'), f, :images

data/app/views/comable/admin/products/_image_fields.slim

@@ -0,0 +1,15 @@
+.col-sm-6
+  label
+    | #{Comable.t('admin.sub_image')}
+    - if local_assigns[:index]
+      span<
+        | ##{index}
+  p
+    = ff.file_field :file
+  - if ff.object.url
+    .thumbnail
+      = image_tag ff.object.url
+      - if ff.object.persisted?
+        label.remove
+          span> = ff.check_box :_destroy
+          span> = Comable.t('admin.actions.destroy')

data/app/views/comable/admin/products/edit.slim

@@ -1,40 +1,41 @@
-#comable-product
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.product'), comable.admin_products_path
-    li.active
-      = @product.name
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li.dropdown
+          = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
+            i.fa.fa-bars
+          ul.dropdown-menu.dropdown-menu-right
+            li
+              = link_to comable.product_path(@product) do
+                span.fa.fa-external-link>
+                = Comable.t('admin.check_this_product_in_frontend')
+            - if @product.sku? || @product.stocks.empty?
+              li.divider
+              li.dropdown-header
+                = Comable.t('admin.nav.stock')
+              li
+                = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path(@product)
+        li
+          = link_to_save
 
-  h1.page-header
-    = @product.name
-    small< = @product.code
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.product'), comable.admin_products_path
+          li.active
+            = @product.name
 
-  .row
-    section.col-sm-8
-      = render 'form'
-      hr
-      .panel.panel-danger
-        .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger" aria-expanded="false" aria-controls="comable-danger"
-          strong
-            span.fa.fa-angle-down>
-            = Comable.t('admin.actions.destroy')
-        #comable-danger.collapse
-          .panel-body
-            p
-              = Comable.t('admin.confirmation_to_remove_product')
-            = link_to Comable.t('admin.actions.destroy'), comable.admin_product_path(@product), method: :delete, class: 'btn btn-danger'
-
-    nav.col-sm-4
-      #comable-affix data-spy="affix"
-        .panel
-          .list-group
-            = link_to Comable.t('admin.nav.products.detail'), comable.admin_product_path(@product), class: 'list-group-item disabled'
-            = link_to Comable.t('admin.nav.products.stock'), comable.admin_product_stocks_path(@product), class: 'list-group-item'
-
-        .panel
-          .list-group
-            = link_to comable.product_path(@product), class: 'list-group-item' do
-              span.fa.fa-external-link>
-              = Comable.t('admin.check_this_product_in_frontend')
+  .comable-page-body
+    = render 'form'
+    hr
+    .panel.panel-danger
+      .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger"
+        strong
+          span.fa.fa-angle-down>
+          = Comable.t('admin.actions.destroy')
+      #comable-danger.collapse
+        .panel-body
+          p
+            = Comable.t('admin.confirmation_to_remove_product')
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_product_path(@product), method: :delete, class: 'btn btn-danger'

data/app/views/comable/admin/products/index.slim

@@ -1,76 +1,70 @@
-#comable-product
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        .btn-group role="group"
+          = link_to_previous_page @products, '<', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | <
+          = link_to_next_page @products, '>', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | >
+      li
+        = link_to comable.root_path do
+          = link_to Comable.t('admin.actions.new'), comable.new_admin_product_path, class: 'btn btn-default'
+
+    h1.page-header
       = Comable.t('admin.nav.product')
+      small<
+        = @products.total_count
+        = Comable.t('admin.results')
 
-  h1.page-header
-    = Comable.t('admin.nav.product')
-    small<
-      = @products.total_count
-      = Comable.t('admin.results')
+  .comable-page-body
+    .comable-search
+      = search_form_for @q, url: comable.admin_products_path do |f|
+        .input-group
+          span.input-group-btn
+            button.btn.btn-default.dropdown-toggle type="button" data-toggle="dropdown"
+              i.fa.fa-search
+              span.caret<
+            ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.clear_search_conditions'), comable.admin_products_path
+          = f.text_field :code_or_name_cont, class: 'form-control'
+          span.input-group-btn
+            = f.submit Comable.t('admin.search'), class: 'btn btn-default'
 
-  .row
-    section.col-sm-8
-      .panel.panel-inverse
-        .panel-heading
-          .panel-title
-            = Comable.t('admin.index')
-        - if @products.empty?
-          .panel-body
-            = Comable.t('admin.not_found')
-        - else
-          table.table.table-striped
-            thead
-              th
-              th
-                = sort_link [:comable, @q], :code
-              th
-                = sort_link [:comable, @q], :name
-              th
-                = sort_link [:comable, @q], :price
-              th
-                = sort_link [:comable, @q], :stocks_quantity
-            tbody
-              - @products.each do |product|
-                - quantity = product.stocks.to_a.sum(&:quantity)
-                tr
-                  td.comable-image
-                    = link_to comable.admin_product_path(product), class: 'thumbnail' do
-                      = image_tag product.image_url
-                  td
-                    = link_to product.code, comable.admin_product_path(product)
-                  td
-                    = product.name
-                  td
-                    = number_to_currency product.price
-                  td
-                    strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
-                      = number_with_delimiter product.stocks.to_a.sum(&:quantity)
+    section
+      - if @products.empty?
+        = Comable.t('admin.not_found')
+      - else
+        table.table.table-striped
+          thead
+            th
+            th
+              = sort_link [:comable, @q], :code
+            th
+              = sort_link [:comable, @q], :name
+            th
+              = sort_link [:comable, @q], :price
+            th
+              = sort_link [:comable, @q], :stocks_quantity
+          tbody
+            - @products.each do |product|
+              - quantity = product.stocks.to_a.sum(&:quantity)
+              tr
+                td.comable-image
+                  = link_to comable.admin_product_path(product), class: 'thumbnail' do
+                    = image_tag product.image_url, width: '100%'
+                td
+                  = link_to product.code, comable.admin_product_path(product)
+                td
+                  = product.name
+                td
+                  = number_to_currency product.price
+                td
+                  strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
+                    = number_with_delimiter product.stocks.to_a.sum(&:quantity)
 
         .text-center
           = paginate @products, theme: :comable_backend
-
-    nav.col-sm-4
-      #comable-affix
-        .panel
-          .list-group
-            = link_to Comable.t('admin.actions.new'), comable.new_admin_product_path, class: 'list-group-item'
-
-        .panel
-          .panel-body
-            = search_form_for @q, url: comable.admin_products_path do |f|
-              .form-horizontal
-                .form-group
-                  .col-sm-3.control-label
-                    = f.label :code
-                  .col-sm-9
-                    = f.text_field :code_cont
-                .form-group
-                  .col-sm-3.control-label
-                    = f.label :name
-                  .col-sm-9
-                    = f.text_field :name_cont
-                .text-right
-                  = f.submit Comable.t('admin.search'), class: 'btn btn-default'

data/app/views/comable/admin/products/new.slim

@@ -1,17 +1,16 @@
-#comable-product
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = link_to Comable.t('admin.nav.product'), comable.admin_products_path
-    li.active
-      = Comable.t('admin.actions.new')
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = Comable.t('admin.actions.new')
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.product'), comable.admin_products_path
+          li.active
+            = Comable.t('admin.actions.new')
 
-  .row
-    section.col-sm-8
-      = render 'form'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'

data/app/views/comable/admin/shared/_footer.slim

@@ -0,0 +1,8 @@
+footer
+  ul.list-inline
+    li
+      | Comable v#{Comable::VERSION::STRING}
+    li
+      = link_to 'GitHub', 'https://github.com/hyoshida/comable'
+    li
+      = link_to 'License', 'https://github.com/hyoshida/comable/blob/master/MIT-LICENSE'

data/app/views/comable/admin/shared/_header.slim

@@ -0,0 +1,31 @@
+header.navbar.navbar-default.navbar-fixed-top
+  .container-fluid
+    .navbar-header
+      = link_to comable.admin_root_path, class: 'navbar-brand' do
+        | Comable
+
+      button.navbar-toggle type="button" data-click="sidebar-toggled" onclick='$(".sidebar").toggleClass("sidebar-open");'
+        span.icon-bar
+        span.icon-bar
+        span.icon-bar
+
+    ul.nav.navbar-nav.navbar-right
+      li
+        = link_to comable.root_path do
+          = Comable.t('admin.back_to_store')
+      li.dropdown.navbar-user
+        a href="#" class="dropdown-toggle" data-toggle="dropdown"
+          span.hidden-xs
+            = current_customer.email
+          span.caret<
+        ul.dropdown-menu.animated.fadeInLeft
+          li.arrow
+          li
+            = link_to comable.edit_admin_customer_path(current_customer) do
+              span.fa.fa-edit>
+              = Comable.t('admin.edit_profile')
+          li.divider
+          li
+            = link_to comable.destroy_customer_session_path, method: :delete do
+              span.fa.fa-sign-in>
+              = Comable.t('admin.sign_out')

data/app/views/comable/admin/shared/_notifier.slim

@@ -0,0 +1,5 @@
+- if flash[:alert] || flash[:notice]
+  #comable-notifier
+    javascript:
+      #{add_gritter(flash[:alert], image: :error) if flash[:alert]}
+      #{add_gritter(flash[:notice], image: :success) if flash[:notice]}

data/app/views/comable/admin/shared/_sidebar.slim

@@ -0,0 +1,52 @@
+.sidebar
+  .vnavigation
+    ul
+      li class="#{'active' if controller_name == 'dashboard'}"
+        = link_to comable.admin_root_path do
+          i.fa.fa-dashboard
+          = Comable.t('admin.nav.dashboard')
+      li class="#{'active' if controller_name == 'orders'}"
+        = link_to comable.admin_orders_path do
+          i.fa.fa-shopping-cart
+          = Comable.t('admin.nav.order')
+      li class="#{'active' if controller_name == 'products'}"
+        = link_to comable.admin_products_path do
+          i.fa.fa-cube
+          = Comable.t('admin.nav.product')
+      li class="#{'active' if controller_name == 'stocks'}"
+        = link_to comable.admin_stocks_path do
+          i.fa.fa-archive
+          = Comable.t('admin.nav.stock')
+      li class="#{'active' if controller_name == 'categories'}"
+        = link_to comable.admin_categories_path do
+          i.fa.fa-tag
+          = Comable.t('admin.nav.category')
+      /
+        li
+          = link_to '#' do
+            i.fa.fa-bar-chart
+            = Comable.t('admin.nav.analytics')
+        li
+          = link_to '#' do
+            i.fa.fa-bullhorn
+            = Comable.t('admin.nav.promotion')
+          ul
+            li
+              = Comable.t('admin.nav.static_page')
+            li
+              = Comable.t('admin.nav.static_content')
+      li class="#{'active' if controller_name == 'customers'}"
+        = link_to comable.admin_customers_path do
+          i.fa.fa-user
+          = Comable.t('admin.nav.customer')
+      li class="#{'active' if controller_name.in? %w( store shipment_methods payment_methods )}"
+        = link_to '#' do
+          i.fa.fa-cog
+          = Comable.t('admin.nav.general_settings')
+        ul
+          li class="#{'active' if controller_name == 'store'}"
+            = link_to Comable.t('admin.nav.store'), comable.admin_store_path
+          li class="#{'active' if controller_name == 'shipment_methods'}"
+            = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
+          li class="#{'active' if controller_name == 'payment_methods'}"
+            = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path