kms_catalog 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30844053e11e92d563963fdcf876d6b5991e3ebc
-  data.tar.gz: ed2c7a1f0f173c3a532b5de4196dadd9d51e43cd
+  metadata.gz: bbc6c9f51c47706cbd71b70f2b07e07a0e310a01
+  data.tar.gz: 15f1d98997ec84183977eb33a7c5868bec10fb71
 SHA512:
-  metadata.gz: fc6ca4ea3068bbe3f938b956e44ce6ba2ad16ceccc7d530ee8f2ef8d6179bf055fb8f69cc8cc071c2a2bb0ba2a93db00f45cbe521099ee405ea653ad1a7b8b6a
-  data.tar.gz: e9bed74cee7b334e6b767a9fdd4e6181407d76406db1bfbb3314733d007887fd8de7e9718e6dd0580b3326be4ac476e2dd1eab4e61749e550e817aec487eb677
+  metadata.gz: cbe098bd66fada4ab904a9b9586573bb3b4c164ef8a581d388458c7dd873dd071a153bcd1d9c59b2636d47f81e8942cb4d3e5fcb1ea8ba207c6849b554539b2c
+  data.tar.gz: de4d05ceead4bf13859a6c724a959cfe6ef13078dc29a8720d1d0971069472dce06c5c92c12b4a9ca5a1d711fc96c282a6f3c56bbbe71a4addeaea671ba10567

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/assets/javascripts/kms_catalog/application/controllers/{categories_controller.coffee → categories_controller.coffee.erb}

@@ -54,8 +54,9 @@ CategoriesController = ($scope, $state, $cookieStore, Restangular, $stateParams)
       console.log('bug')
 
   $scope.destroy = (category)->
-    category.remove().then ->
-      $scope.categories = _.without($scope.categories, category)
+    if(confirm('<%= I18n.t(:are_you_sure) %>'))
+      category.remove().then ->
+        $scope.categories = _.without($scope.categories, category)
 
 
 

data/app/assets/javascripts/kms_catalog/application/controllers/{products_controller.coffee → products_controller.coffee.erb}

@@ -1,4 +1,4 @@
-ProductsController = ($scope, $state, $cookieStore, Restangular, $stateParams) ->
+ProductsController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService) ->
   $scope.editorOptions =
     filebrowserUploadUrl: '/assets/ckeditor'
 
@@ -13,12 +13,16 @@ ProductsController = ($scope, $state, $cookieStore, Restangular, $stateParams) -
   $scope.store.getList().then (products)->
     $scope.products = products
 
+
   if $stateParams.id
+    $scope.variantsStore = Restangular.one('products', $stateParams.id).all('variants')
     $scope.store.get($stateParams.id).then (product)->
       $scope.product = product
   else
     $scope.product = {category_ids: []}
 
+  $scope.variant = {}
+
   $scope.addCat = (item, model) ->
     index = $scope.product.category_ids.indexOf(item.id)
     unless index > -1
@@ -32,39 +36,56 @@ ProductsController = ($scope, $state, $cookieStore, Restangular, $stateParams) -
     fd = new FormData
     fd.append('product[name]', $scope.product.name || '')
     fd.append('product[description]', $scope.product.description || '')
-    fd.append('product[price]', $scope.product.price || '')
+    fd.append('product[master_attributes][price]', $scope.product.master.price || '')
     fd.append('product[category_ids]', $scope.product.category_ids)
-    fd.append('product[image]', $scope.product.image)
-    fd.append('product[preview_image]', $scope.product.preview_image)
+    fd.append('product[master_attributes][image]', $scope.product.master.image)
     fd.append('product[seo_title]', $scope.product.seo_title || '')
     fd.append('product[seo_keywords]', $scope.product.seo_keywords || '')
     fd.append('product[seo_description]', $scope.product.seo_description || '')
-    $scope.store.withHttpConfig({ transformRequest: angular.identity }).post(fd, null, {"Content-Type": undefined}).then ->
-      $state.go('products')
-    ,->
-      console.log('bug')
+    $scope.store.withHttpConfig({ transformRequest: angular.identity }).post(fd, null, {"Content-Type": undefined}).then (product)->
+      $scope.product = product
+      $state.go('products.edit', {id: $scope.product.id })
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
 
   $scope.update = ->
     fd = new FormData
     fd.append('product[name]', $scope.product.name || '')
     fd.append('product[description]', $scope.product.description || '')
-    fd.append('product[price]', $scope.product.price || '')
+    fd.append('product[master_attributes][id]', $scope.product.master.id || '')
+    fd.append('product[master_attributes][price]', $scope.product.master.price || '')
     fd.append('product[category_ids]', $scope.product.category_ids)
     fd.append('product[seo_title]', $scope.product.seo_title || '')
     fd.append('product[seo_keywords]', $scope.product.seo_keywords || '')
     fd.append('product[seo_description]', $scope.product.seo_description || '')
-    if $scope.product.image.constructor.name == "File"
-      fd.append('product[image]', $scope.product.image)
-    if $scope.product.preview_image.constructor.name == "File"
-      fd.append('product[preview_image]', $scope.product.preview_image)
+    if $scope.product.master.image.constructor.name == "File"
+      fd.append('product[master_attributes][image]', $scope.product.master.image)
     $scope.product.withHttpConfig({ transformRequest: angular.identity }).post('', fd, '', {"Content-Type": undefined}).then ->
-      $state.go('products')
-    ,->
-      console.log('bug')
+      $state.go('products.edit')
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
+
+  $scope.createVariant = ->
+    fd = new FormData
+    fd.append('variant[name]', $scope.variant.name || '')
+    fd.append('variant[price]', $scope.variant.price || '')
+    fd.append('variant[image]', $scope.variant.image)
+    $scope.variantsStore.withHttpConfig({ transformRequest: angular.identity }).post(fd, null, {"Content-Type": undefined}).then (variant)->
+      $scope.variant = {}
+      $scope.product.variants.push(variant)
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
+
+  $scope.destroyVariant = (variant)->
+    if(confirm('<%= I18n.t(:are_you_sure) %>'))
+      restangular_variant = Restangular.restangularizeElement($scope.product, variant, 'variants')
+      restangular_variant.remove().then ->
+        $scope.product.variants = _.without($scope.product.variants, variant)
 
   $scope.destroy = (product)->
-    product.remove().then ->
-      $scope.products = _.without($scope.products, product)
+    if(confirm('<%= I18n.t(:are_you_sure) %>'))
+      product.remove().then ->
+        $scope.products = _.without($scope.products, product)
 
   $scope.exceptCurrentCategory = ->
     new_products = []
@@ -74,4 +95,4 @@ ProductsController = ($scope, $state, $cookieStore, Restangular, $stateParams) -
 
 
 angular.module('KMS')
-    .controller('ProductsController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', ProductsController])
+    .controller('ProductsController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', ProductsController])

data/app/assets/javascripts/kms_catalog/application/controllers/variants_controller.coffee.erb

@@ -0,0 +1,22 @@
+VariantsController = ($scope, $state, $cookieStore, Restangular, $stateParams, Alertify, ErrorsService) ->
+  $scope.store = Restangular.one('products', $stateParams.product_id).all('variants')
+  # $scope.store.getList().then (variants) ->
+  #    $scope.variants = variants#_.groupBy(option_types, 'tag')
+
+  $scope.store.get($stateParams.id).then (variant)->
+    $scope.variant = variant
+
+  $scope.update = ->
+    fd = new FormData
+    fd.append('variant[name]', $scope.variant.name || '')
+    fd.append('variant[price]', $scope.variant.price || '')
+    if $scope.variant.image.constructor.name == "File"
+      fd.append('variant[image]', $scope.variant.image)
+    $scope.variant.withHttpConfig({ transformRequest: angular.identity }).post('', fd, '', {"Content-Type": undefined}).then ->
+      $state.go('products.edit', {id: $scope.variant.product_id})
+    ,(response)->
+      Alertify.error(ErrorsService.prepareErrorsString(response.data.errors))
+
+
+angular.module('KMS')
+    .controller('VariantsController', ['$scope', '$state', '$cookieStore', 'Restangular', '$stateParams', 'Alertify', 'ErrorsService', VariantsController])

data/app/assets/javascripts/templates/help/catalog_variables.html.slim

@@ -11,7 +11,7 @@ p
       p
         table.table
           tr
-            th #{ I18n.t('liquor_help.properties') } Category
+            th #{ I18n.t('liquor_help.property') } Category
             th = I18n.t('liquor_help.description')
           tr
             td name
@@ -44,7 +44,7 @@ p
       p
         table.table
           tr
-            th #{ I18n.t('liquor_help.properties') } Product
+            th #{ I18n.t('liquor_help.property') } Product
             th = I18n.t('liquor_help.description')
           tr
             td name

data/app/assets/javascripts/templates/products/edit.html.slim

@@ -1,25 +1,38 @@
 .row
   .col-lg-12
-    form role="form" ng-submit="update()"
-      ng-include src="'products/form.html'"
-      button.btn.btn-default type="submit" = I18n.t(:update_product)
-.row
-  .col-lg-12
-    a.btn.btn-default ui-sref="variants({product_id: product.id})"
-      = Kms::Variant.model_name.human(count: 1.1)
-accordion close-others="true"
-  ng-include src="'products/properties.html'"
-  ng-include src="'products/option_types.html'"
-  accordion-group is-open="status.open"
-    accordion-heading
-      i.pull-left.glyphicon ng-class="{'glyphicon-chevron-down': status.open, 'glyphicon-chevron-right': !status.open}"
-      |  SEO
-    .form-group
-      label for="seo_title" = Kms::Product.human_attribute_name(:seo_title)
-      input#seo_title.form-control type="text" ng-model="product.seo_title"
-    .form-group
-      label for="seo_keywords" = Kms::Product.human_attribute_name(:seo_keywords)
-      input#seo_keywords.form-control type="text" ng-model="product.seo_keywords"
-    .form-group
-      label for="seo_description" = Kms::Product.human_attribute_name(:seo_description)
-      input#seo_description.form-control type="text" ng-model="product.seo_description"
+    tabset
+      tab
+        tab-heading
+          i.fa.fa-barcode
+          |  {{ product.name }}
+        .widget style="background-color: #f3f3f3;"
+          .widget-body
+            .row
+              .col-lg-12
+                form role="form" ng-submit="update()"
+                  ng-include src="'products/form.html'"
+                  button.btn.btn-default type="submit" = I18n.t(:update_product)
+            accordion close-others="true"
+              ng-include src="'products/properties.html'"
+              ng-include src="'products/option_types.html'"
+              accordion-group is-open="status.open"
+                accordion-heading
+                  i.pull-left.glyphicon ng-class="{'glyphicon-chevron-down': status.open, 'glyphicon-chevron-right': !status.open}"
+                  |  SEO
+                .form-group
+                  label for="seo_title" = Kms::Product.human_attribute_name(:seo_title)
+                  input#seo_title.form-control type="text" ng-model="product.seo_title"
+                .form-group
+                  label for="seo_keywords" = Kms::Product.human_attribute_name(:seo_keywords)
+                  input#seo_keywords.form-control type="text" ng-model="product.seo_keywords"
+                .form-group
+                  label for="seo_description" = Kms::Product.human_attribute_name(:seo_description)
+                  input#seo_description.form-control type="text" ng-model="product.seo_description"
+      tab
+        tab-heading
+          i.fa.fa-plus
+          |  
+          = Kms::Variant.model_name.human(count: 1.1)
+        .widget
+          .widget-body
+            ng-include src="'products/variants/index.html'"

data/app/assets/javascripts/templates/products/form.html.slim

@@ -6,29 +6,20 @@
   textarea#description.form-control ng-model="product.description" rows="15" ng-if="currentUser.admin" ui-codemirror="{lineNumbers: true, mode:'htmlmixed'}"
   textarea#description.form-control ng-model="product.description" rows="15" ng-if="!currentUser.admin" ckeditor='editorOptions'
 .form-group
-  label for="price" = Kms::Product.human_attribute_name(:price)
-  input#price.form-control type="text" ng-model="product.price"
+  label for="price" = Kms::Variant.human_attribute_name(:price)
+  input#price.form-control type="text" ng-model="product.master.price"
 .form-group
   label for="category_ids" = Kms::Product.human_attribute_name(:categories)
-  /select#categories_ids.form-control.ui-select-multiple ng-model="category.categories_ids" ng-options="category.id as category.name for category in categories" required=""
   ui-select multiple="" ng-model="product.category_ids" theme="bootstrap" on-select="addCat($item, $model)" on-remove='removeCat($item, $model)'
     ui-select-match placeholder="Выберите категории..."
       | {{$item.name}}
     ui-select-choices repeat="category.id as category in categories"
       div ng-bind-html="category.name | highlight: $select.search"
 .form-group
-  label for="image" = Kms::Product.human_attribute_name(:image)
-  div flow-init="{singleFile: true, headers: setHeaders, fileParameterName: 'product[image]'}" flow-files-submitted="product.image = $flow.files[0].file" flow-file-added="!!{png:1,gif:1,jpg:1,jpeg:1}[$file.getExtension()]" flow-file-success="$file.msg = $message"
-    input type="file" flow-btn="" ng-model='product.image'
+  label for="image" = Kms::Variant.human_attribute_name(:image)
+  div flow-init="{singleFile: true, headers: setHeaders, fileParameterName: 'product[master][image]'}" flow-files-submitted="product.master.image = $flow.files[0].file" flow-file-added="!!{png:1,gif:1,jpg:1,jpeg:1}[$file.getExtension()]" flow-file-success="$file.msg = $message"
+    input type="file" flow-btn="" ng-model='product.master.image'
     div class="thumbnail" ng-show="!$flow.files.length"
-      img ng-src="{{product.image.url}}"
-    div class="thumbnail" ng-show="$flow.files.length"
-      img flow-img="$flow.files[0]"
-.form-group
-  label for="preview_image" = Kms::Product.human_attribute_name(:preview_image)
-  div flow-init="{singleFile: true, headers: setHeaders, fileParameterName: 'product[preview_image]'}" flow-files-submitted="product.preview_image = $flow.files[0].file" flow-file-added="!!{png:1,gif:1,jpg:1,jpeg:1}[$file.getExtension()]" flow-file-success="$file.msg = $message"
-    input type="file" flow-btn="" ng-model='product.preview_image'
-    div class="thumbnail" ng-show="!$flow.files.length"
-      img ng-src="{{product.preview_image.url}}"
+      img ng-src="{{product.master.image.url}}"
     div class="thumbnail" ng-show="$flow.files.length"
       img flow-img="$flow.files[0]"

data/app/assets/javascripts/templates/products/index.html.slim

@@ -4,7 +4,6 @@
       .widget-header
         i.fa.fa-barcode
         = Kms::Product.model_name.human(count: 1.1)
-        /a.pull-right href="#"  Manage
         a.btn.btn-sm.btn-primary.pull-right ui-sref="products.new"
           = I18n.t("add_product")
       .widget-body.no-padding
@@ -12,8 +11,10 @@
           table.table
             tbody
               tr ng-repeat="product in products"
-                td style="width: 80%"
+                td style="width: 70%"
                   | {{ product.name }}
+                td style="width: 20%"
+                  | {{ product.master.price }}
                 td
                   .btn-group.pull-right
                     a.btn.btn-sm.btn-info ui-sref="products.edit({id: product.id})"

data/app/assets/javascripts/templates/products/option_types.html.slim

@@ -33,7 +33,7 @@ accordion-group is-open="status.open"
         .form-group
           label for="tag" = Kms::OptionType.human_attribute_name(:tag)
           .row
-            .col-lg-6
+            .col-lg-6 style="padding-left:0"
               input#tag.form-control type="text" ng-model="option_type.tag" placeholder=I18n.t(:type_group_name_for_options_placeholder)
             .col-lg-6
               ui-select ng-model='option_type.tag'

data/app/assets/javascripts/templates/products/properties.html.slim

@@ -35,7 +35,7 @@ accordion-group is-open="status.open"
         .form-group
           label for="tag" = Kms::Property.human_attribute_name(:tag)
           .row
-            .col-lg-6
+            .col-lg-6 style="padding-left:0"
               input#tag.form-control type="text" ng-model="property.tag" placeholder=I18n.t(:type_group_name_for_properties_placeholder)
             .col-lg-6
               ui-select ng-model='property.tag'

data/app/assets/javascripts/templates/products/variants/index.html.slim

@@ -1,22 +1,20 @@
 .row
   .col-lg-12
-    .widget
-      .widget-header
-        i.fa.fa-barcode
-        = Kms::Variant.model_name.human(count: 1.1)
-        /a.pull-right href="#"  Manage
-        a.btn.btn-sm.btn-primary.pull-right ui-sref="variants.new"
-          = I18n.t("add_variant")
-      .widget-body.no-padding
-        .table-responsive
-          table.table
-            tbody
-              tr ng-repeat="variant in variants"
-                td style="width: 80%"
-                  | {{ variant.name }}
-                td
-                  .btn-group.pull-right
-                    a.btn.btn-sm.btn-info ui-sref="variants.edit({id: variant.id})"
-                      i.fa.fa-pencil
-                    a.btn.btn-sm.btn-danger ng-click="destroy(variant)"
-                      i.fa.fa-times
+    ng-include src="'products/variants/new.html'"
+  .col-lg-12
+    .table-responsive
+      table.table
+        tbody
+          tr ng-repeat="variant in product.variants"
+            td style="width: 10%"
+              img.img-responsive ng-src="{{ variant.image.url }}"
+            td style="width: 70%"
+              | {{ variant.name }}
+            td style="width: 10%"
+              | {{ variant.price }}
+            td
+              .btn-group.pull-right
+                a.btn.btn-sm.btn-info ui-sref="variants.edit({product_id: product.id, id: variant.id})"
+                  i.fa.fa-pencil
+                a.btn.btn-sm.btn-danger ng-click="destroyVariant(variant)"
+                  i.fa.fa-times

data/app/assets/javascripts/templates/products/variants/new.html.slim

@@ -1,5 +1,3 @@
-.row
-  .col-lg-12
-    form role="form" ng-submit="create()"
-      ng-include src="'products/variants/form.html'"
-      button.btn.btn-default type="submit" = I18n.t(:add_variant)
+form role="form" ng-submit="createVariant()"
+  ng-include src="'products/variants/form.html'"
+  button.btn.btn-default type="submit" = I18n.t(:add_variant)

data/app/controllers/kms/catalog/products_controller.rb

@@ -2,38 +2,38 @@ module Kms
   module Catalog
     class ProductsController < ApplicationController
       def index
-        render json: Product.order(:name).to_json
+        render json: Product.order(:name)
       end
 
       def create
         product_params[:category_ids] = product_params[:category_ids].split(',') if product_params[:category_ids]
         @product = Product.new(product_params)
         @product.save
-        render json: @product.to_json
+        render json: @product
       end
 
       def update
         product_params[:category_ids] = product_params[:category_ids].split(',') if product_params[:category_ids]
         @product = Product.find(params[:id])
         @product.update_attributes(product_params)
-        render json: @product.to_json
+        render json: @product
       end
 
       def show
         @product = Product.find(params[:id])
-        render json: @product.to_json(methods: :category_ids, include: :properties)
+        render json: @product
       end
 
       def destroy
         @product = Product.find(params[:id])
         @product.destroy
-        render json: @product.to_json
+        render json: @product
       end
 
       protected
 
       def product_params
-        params.require(:product).permit!
+        params.require(:product).permit(:name, :description, :category_ids, :seo_title, :seo_keywords, :seo_description, master_attributes: [:price, :image, :id])
       end
     end
   end

data/app/models/kms/master_variant.rb

@@ -0,0 +1,4 @@
+module Kms
+  class MasterVariant < Variant
+  end
+end

data/app/models/kms/product.rb

@@ -10,11 +10,26 @@ module Kms
     has_many :product_option_types, dependent: :destroy
     has_many :option_types, through: :product_option_types
 
-    has_many :variants, dependent: :destroy
+    has_many :variants,
+      -> { where(type: Kms::Variant.name) },
+      class_name: 'Kms::Variant', dependent: :destroy
+
+    has_one :master, class_name: 'Kms::MasterVariant', dependent: :destroy
 
     friendly_id :name, use: :slugged
 
-    mount_uploader :image, ProductImageUploader
-    mount_uploader :preview_image, ProductImageUploader
+    # mount_uploader :image, ProductImageUploader
+    # mount_uploader :preview_image, ProductImageUploader
+
+    accepts_nested_attributes_for :master
+
+    after_initialize :init_master
+
+    protected
+
+    def init_master
+      return unless new_record?
+      self.master ||= build_master
+    end
   end
 end