comable-backend 0.6.0 → 0.7.0.beta1

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

@@ -0,0 +1,40 @@
+= error_messages_for @navigation
+
+- url = @navigation.new_record? ? comable.admin_navigations_path : comable.admin_navigation_path(@navigation)
+
+= form_for @navigation, url: url do |f|
+  .hidden
+    = f.submit
+
+  fieldset
+    .col-md-3
+      legend
+        = Comable.t('admin.nav.navigations.general')
+
+    .col-md-9
+      .form-group
+        = f.label :name
+        = f.text_field :name
+
+  hr
+
+  fieldset
+    .col-md-3
+      legend
+        = Comable.t('admin.nav.navigations.navigation_items')
+
+    .col-md-9
+      #navigation-items
+        = f.fields_for :navigation_items do |navigation_items_form|
+          = render 'navigation_item_fields', f: navigation_items_form
+
+  hr
+
+  .row
+    = add_fields_button_tag Comable.t('admin.nav.navigation_items.add_link'), f, :navigation_items
+
+.hidden
+  = form_tag(comable.search_linkable_ids_admin_navigations_path, remote: true) do
+    = text_field_tag :linkable_type
+    = text_field_tag :position
+    = submit_tag

data/app/views/comable/admin/navigations/_navigation_item_fields.slim

@@ -0,0 +1,24 @@
+- linkable_class = f.object.linkable_class
+- link_selectable = linkable_class.try(:linkable_exists?)
+
+fieldset.navigation-item class="#{'hidden' if f.object._destroy}"
+  .row
+    .col-sm-3
+      = f.label :name
+      = f.text_field :name
+
+    .col-sm-3
+      = f.label :linkable_type
+      = f.select :linkable_type, linkable_type_options, {}, class: :linkable_type
+
+    .col-sm-3.url class="#{'hidden' if link_selectable}"
+      = f.label :url
+      = f.text_field :url
+
+    .col-sm-3.linkable_id class="#{'hidden' unless link_selectable}"
+      = f.select :linkable_id, linkable_id_options(f.object)
+
+    .col-sm-3
+      = f.hidden_field :_destroy, class: :destroy
+      button.btn.btn-default.pull-right.remove_fields type="button"
+        = Comable.t('actions.destroy')

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

@@ -0,0 +1,27 @@
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
+
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.navigation'), comable.admin_navigations_path
+          li.active
+            = @navigation.name
+
+  .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_navigation')
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_navigation_path(@navigation), method: :delete, class: 'btn btn-danger'

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

@@ -0,0 +1,25 @@
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_navigation_path, class: 'btn btn-default'
+    h1.page-header
+      = Comable.t('admin.nav.navigation')
+      small<
+        | #{@navigations.size} #{Comable.t('admin.results')}
+
+  .comable-page-body
+    section
+      - if @navigations.empty?
+        = Comable.t('admin.not_found')
+      - else
+        table.table.table-striped
+          thead
+            th
+              = sort_link [:comable, @q], :name
+
+          tbody
+            - @navigations.each do |navigation|
+              tr
+                td
+                  = link_to navigation.name, comable.admin_navigation_path(navigation)

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

@@ -0,0 +1,16 @@
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
+
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.navigation'), comable.admin_navigations_path
+          li.active
+            = Comable.t('admin.actions.new')
+
+  .comable-page-body
+    = render 'form'

data/app/views/comable/admin/navigations/search_linkable_ids.coffee

@@ -0,0 +1,15 @@
+$url = $('#navigation_navigation_items_attributes_<%= params[:position] %>_url')
+$linkable_id = $('#navigation_navigation_items_attributes_<%= params[:position] %>_linkable_id')
+
+$linkable_id.html('<%= options_for_select(@linkable_id_options) %>')
+
+if <%= params[:linkable_type].blank? %>
+  # アドレスを入力する場合
+  $linkable_id.closest('.linkable_id').addClass('hidden')
+  $linkable_id.val('')
+  $url.closest('.url').removeClass('hidden')
+
+else
+  $url.closest('.url').addClass('hidden')
+  $url.val('')
+  $linkable_id.closest('.linkable_id').removeClass('hidden')

data/app/views/comable/admin/orders/show.slim

@@ -64,7 +64,7 @@
                   td
                     = order_item.name_with_sku
                     .text-muted
-                      small = order_item.code
+                      small = order_item.sku
                   td
                     = number_to_currency order_item.price
                   td

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

@@ -14,21 +14,13 @@
       .help-block
 
     .col-md-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
+        = f.text_area :caption
 
       / TODO: Refactoring
       javascript:
@@ -43,64 +35,6 @@
 
   hr
 
-  fieldset
-    .col-md-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-md-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-md-3
       legend
@@ -131,7 +65,96 @@
           .row
             - sub_images.each.with_index(1) do |image, index|
               = f.fields_for :images, image do |ff|
-                = render 'comable/admin/shared/image_fields', ff: ff, index: index
+                = render 'comable/admin/shared/images_fields', f: ff, index: index
 
             .col-md-6
               = link_to_add_fields Comable.t('admin.add_sub_image'), f, :images
+
+  hr
+
+  - if @product.new_record? || @product.master?
+    = f.fields_for :variants, f.object.variants.first do |ff|
+      = render 'comable/admin/shared/variant_form', f: ff
+      = ff.hidden_field :_destroy, value: !f.object.master?
+    hr
+
+  - if @product.new_record? || @product.persisted? && !@product.master?
+    fieldset
+      .col-md-3
+        legend
+          = Comable.t('admin.variants')
+
+      .col-md-9
+        = f.fields_for :option_types, f.object.option_types do |ff|
+          = render 'comable/admin/shared/option_types_fields', f: ff, readonly: @product.persisted?
+
+        - if @product.new_record?
+          = link_to_add_fields Comable.t('admin.add_variants'), f, :option_types, class: 'btn btn-link js-add-option'
+
+          table.table.table-striped.js-variants-table class="#{'hidden' if @product.master?}"
+            thead
+              th
+              th
+                = Comable.t('admin.variants')
+              th
+                = @product.variants.human_attribute_name(:sku)
+              th
+                = @product.variants.human_attribute_name(:price)
+              th
+                = @product.variants.human_attribute_name(:quantity)
+            tbody
+              = f.fields_for :variants do |ff|
+                = render 'comable/admin/shared/variants_fields', f: ff
+          = link_to_add_fields nil, f, :variants, class: 'hidden js-add-variant'
+
+        - if @product.persisted?
+          table.table.table-striped
+            thead
+              th
+                = @product.variants.human_attribute_name(:sku)
+              th
+                = @product.variants.human_attribute_name(:price)
+              th
+                = @product.variants.human_attribute_name(:quantity)
+              th
+                = Comable.t('admin.variants')
+              th
+                = Comable.t('admin.operation')
+            tbody
+              - @product.variants.each do |variant|
+                tr
+                  td
+                    = variant.sku
+                  td
+                    = number_to_currency variant.price
+                  td
+                    - quantity = variant.quantity
+                    strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
+                      = number_with_delimiter quantity
+                  td
+                    - variant.options.each do |option|
+                      span.comable-variant-name
+                        = option.value
+                  td
+                    = link_to comable.admin_product_variant_path(@product, variant), class: 'btn btn-default'
+                      i.fa.fa-edit>
+                      = Comable.t('admin.actions.edit')
+
+    hr
+
+  fieldset
+    .col-md-3
+      legend
+        = Comable.t('admin.nav.products.visibility')
+
+    .col-md-9
+      .form-group
+        .radio-inline
+          label
+            = f.radio_button :published_at, :published, checked: @product.published_at.present?
+            = Comable.t('admin.nav.products.published')
+        .radio-inline
+          label
+            = f.radio_button :published_at, :unpublished, checked: @product.published_at.blank?
+            = Comable.t('admin.nav.products.unpublished')
+        = f.text_field :published_at, value: @product.published_at.try(:strftime, '%Y-%m-%d %H:%M'), class: 'datetimepicker'

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

@@ -2,6 +2,10 @@
   .comable-main-fixed-top
     .comable-page-heading
       ul.pull-right.list-inline
+        li
+          = link_to comable.product_path(@product), class: 'btn btn-default', target: '_blank' do
+            i.fa.fa-external-link>
+            = Comable.t('admin.preview')
         li.dropdown
           = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
             i.fa.fa-bars

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

@@ -47,7 +47,7 @@
                 = link_to Comable.t('admin.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
               li
                 = link_to Comable.t('admin.clear_search_conditions'), comable.admin_products_path
-          = f.text_field :code_or_name_cont_any_splitted, class: 'form-control'
+          = f.text_field :name_or_variants_sku_cont_any_splitted, class: 'form-control'
           span.input-group-btn
             = f.submit Comable.t('admin.search'), class: 'btn btn-default'
 
@@ -60,8 +60,6 @@
         table.table.table-striped
           thead
             th
-            th
-              = sort_link [:comable, @q], :code
             th
               = sort_link [:comable, @q], :name
             th
@@ -70,26 +68,30 @@
               = Comable.t('admin.stocks')
           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
+                  = link_to product.name, comable.admin_product_path(product)
+                  - unless product.published?
+                    span.fa.fa-eye-slash.text-muted<
                 td
                   = number_to_currency product.price
                 td
                   ul.list-unstyled
-                    - product.stocks.each do |stock|
+                    - product.variants.each do |variant|
                       li
+                        - quantity = variant.quantity
                         strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
-                          = number_with_delimiter stock.quantity
-                        - if stock.sku?
+                          = number_with_delimiter quantity
+                        - if !product.master?
                           span<
-                            | (#{stock.sku_name})
+                            | (
+                            - variant.options.each do |option|
+                              span.comable-variant-name
+                                = option.value
+                            | )
 
         .text-center
           = paginate @products, theme: :comable_backend

data/app/views/comable/admin/shared/{_image_fields.slim → _images_fields.slim}

@@ -5,11 +5,11 @@
       span<
         | ##{index}
   p
-    = ff.file_field :file
-  - if ff.object.url
+    = f.file_field :file
+  - if f.object.url
     .thumbnail
-      = image_tag ff.object.url
-      - if ff.object.persisted?
+      = image_tag f.object.url
+      - if f.object.persisted?
         label.remove
-          span> = ff.check_box :_destroy
+          span> = f.check_box :_destroy
           span> = Comable.t('admin.actions.destroy')

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

@@ -0,0 +1,13 @@
+- readonly ||= false
+
+.comable-option
+  .form-group
+    .row
+      .col-xs-4
+        = text_field_tag :option_type, nil, placeholder: Comable.t('admin.size'), class: 'comable-option-name', disabled: readonly
+
+      .col-xs-8
+        ul.js-tagit-option-values.comable-option-values data-index="#{f.index}" class="#{'tagit-readonly' if readonly}"
+          - f.object.values.each do |value|
+            li
+              = value