comable-backend 0.6.0 → 0.7.0.beta1

data/app/controllers/comable/admin/navigations_controller.rb

@@ -0,0 +1,84 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class NavigationsController < Comable::Admin::ApplicationController
+      load_and_authorize_resource class: Comable::Navigation.name, except: :index
+
+      def index
+        @q = Comable::Navigation.ransack(params[:q])
+        @navigations = @q.result.accessible_by(current_ability)
+      end
+
+      def show
+        edit
+        render :edit
+      end
+
+      def new
+        @navigation.navigation_items.build
+      end
+
+      def edit
+      end
+
+      def create
+        @navigation = Comable::Navigation.new(navigation_params)
+        if @navigation.save
+          redirect_to comable.admin_navigation_path(@navigation), notice: Comable.t('successful')
+        else
+          render :new
+        end
+      end
+
+      def update
+        @navigation.attributes = navigation_params
+        if @navigation.save
+          redirect_to comable.admin_navigation_path(@navigation), notice: Comable.t('successful')
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        @navigation.destroy
+        redirect_to comable.admin_navigations_path, notice: Comable.t('successful')
+      end
+
+      def search_linkable_ids
+        @linkable_id_options = linkable_id_options
+        render layout: false
+      end
+
+      private
+
+      def linkable_type
+        return if params[:linkable_type].blank?
+        params[:linkable_type] if Comable.const_defined?(params[:linkable_type].demodulize)
+      end
+
+      def linkable_id_options
+        linkable_type ? linkable_type.constantize.linkable_id_options : [[]]
+      end
+
+      def navigation_params
+        params.require(:navigation).permit(
+          :name,
+          navigation_items_attributes: navigation_items_attributes_keys
+        )
+      end
+
+      def navigation_items_attributes_keys
+        [
+          :id,
+          :position,
+          :linkable_id,
+          :linkable_type,
+          :name,
+          :url,
+          :_destroy
+        ]
+      end
+    end
+  end
+end

data/app/controllers/comable/admin/orders_controller.rb

@@ -7,6 +7,9 @@ module Comable
 
       load_and_authorize_resource class: Comable::Order.name, except: :index
 
+      rescue_from ActiveRecord::RecordInvalid, with: :redirect_to_back_with_alert
+      rescue_from Comable::PaymentError, with: :redirect_to_back_with_alert
+
       def index
         @q = Comable::Order.complete.ransack(params[:q])
         @orders = @q.result.page(params[:page]).per(15).recent.accessible_by(current_ability)
@@ -38,50 +41,36 @@ module Comable
       def cancel
         @order.cancel!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def resume
         @order.resume!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def cancel_payment
         @order.payment.cancel!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def resume_payment
         @order.payment.resume!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def ship
         @order.shipment.ship!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def cancel_shipment
         @order.shipment.cancel!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       def resume_shipment
         @order.shipment.resume!
         redirect_to :back, notice: Comable.t('successful')
-      rescue ActiveRecord::RecordInvalid => e
-        redirect_to :back, alert: e.message
       end
 
       private
@@ -97,6 +86,10 @@ module Comable
           order_items_attributes: [:id, :name, :code, :price, :quantity]
         )
       end
+
+      def redirect_to_back_with_alert(exception)
+        redirect_to :back, alert: exception.message
+      end
     end
   end
 end

data/app/controllers/comable/admin/products_controller.rb

@@ -7,14 +7,17 @@ module Comable
 
       def index
         @q = Comable::Product.ransack(params[:q])
-        @products = @q.result(distinct: true).includes(:stocks, :images).page(params[:page]).accessible_by(current_ability)
+        @products = @q.result(distinct: true).includes(:images, variants: [:option_values, :stock]).page(params[:page]).accessible_by(current_ability)
       end
 
       def show
+        edit
         render :edit
       end
 
       def new
+        @product.variants.build
+        @product.published_at = Date.today
       end
 
       def create
@@ -27,6 +30,7 @@ module Comable
       end
 
       def edit
+        set_preview_session
       end
 
       def update
@@ -68,15 +72,19 @@ module Comable
       def product_params
         params.require(:product).permit(
           :name,
-          :code,
           :caption,
-          :price,
-          :sku_h_item_name,
-          :sku_v_item_name,
+          :published_at,
           category_path_names: [],
-          images_attributes: [:id, :file, :_destroy]
+          images_attributes: [:id, :file, :_destroy],
+          variants_attributes: [:id, :price, :sku, :options, :quantity, :_destroy],
+          option_types_attributes: [:id, :name, { values: [] }]
         )
       end
+
+      def set_preview_session
+        session[Comable::Product::PREVIEW_SESSION_KEY] ||= {}
+        session[Comable::Product::PREVIEW_SESSION_KEY][@product.to_param] = true
+      end
     end
   end
 end

data/app/controllers/comable/admin/stocks_controller.rb

@@ -10,7 +10,7 @@ module Comable
 
       def index
         @q = @stocks.ransack(params[:q])
-        @stocks = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability)
+        @stocks = @q.result.includes(variant: [:product, :option_values]).page(params[:page]).accessible_by(current_ability)
       end
 
       def show
@@ -21,6 +21,9 @@ module Comable
       end
 
       def create
+        # TODO: Remove
+        @stock.build_variant(product: @product) unless @stock.variant
+
         if @stock.save
           redirect_to comable.admin_stock_path(@stock), notice: Comable.t('successful')
         else
@@ -52,7 +55,7 @@ module Comable
 
       def export
         q = @stocks.ransack(params[:q])
-        stocks = q.result.includes(:product).accessible_by(current_ability)
+        stocks = q.result.includes(variant: :product).accessible_by(current_ability)
 
         respond_to_export_with stocks
       end

data/app/controllers/comable/admin/themes_controller.rb

@@ -42,7 +42,7 @@ module Comable
 
       def destroy
         @theme.destroy
-        FileUtils.rm_rf(theme_dir)
+        @theme.dir.rmtree if @theme.dir.exist?
         redirect_to comable.admin_themes_path, notice: Comable.t('successful')
       end
 
@@ -51,7 +51,7 @@ module Comable
       end
 
       def show_file
-        @code = File.read(filepath) if filepath && File.exist?(filepath)
+        @code = filepath.read if filepath.try(:file?)
       end
 
       def update_file
@@ -74,17 +74,13 @@ module Comable
         # Validate the Liquid syntax
         Liquid::Template.parse(params[:code])
 
-        FileUtils.mkdir_p(File.dirname(filepath)) unless File.exist?(filepath)
-        File.write(filepath, params[:code])
-      end
-
-      def theme_dir
-        File.join('themes', @theme.name)
+        filepath.dirname.mkpath unless filepath.dirname.exist?
+        filepath.write(params[:code])
       end
 
       def filepath
         return unless params[:path]
-        File.join(theme_dir, params[:path])
+        @theme.dir + params[:path]
       end
 
       def theme_params

data/app/controllers/comable/admin/variants_controller.rb

@@ -0,0 +1,59 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class VariantsController < Comable::Admin::ApplicationController
+      load_and_authorize_resource :product, class: Comable::Product.name
+      load_and_authorize_resource :variant, class: Comable::Variant.name, through: :product
+
+      def index
+        @q = @variants.ransack(params[:q])
+        @variants = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability)
+      end
+
+      def show
+        render :edit
+      end
+
+      def new
+      end
+
+      def create
+        if @variant.save
+          redirect_to comable.admin_product_variant_path(@product, @variant), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @variant.update_attributes(variant_params)
+          redirect_to comable.admin_product_variant_path(@product, @variant), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      def destroy
+        @variant.destroy
+        redirect_to comable.admin_product_variants_path(@product), notice: Comable.t('successful')
+      end
+
+      private
+
+      def variant_params
+        params.require(:variant).permit(
+          :price,
+          :sku,
+          stock_attributes: [:quantity],
+          option_values_attributes: [:id, :name]
+        )
+      end
+    end
+  end
+end

data/app/helpers/comable/admin/application_helper.rb

@@ -10,28 +10,29 @@ module Comable
         image_tag "//www.gravatar.com/avatar/#{hash}?default=mm", options
       end
 
-      def link_to_add_fields(name, f, association, options = {})
-        new_object = f.object.class.reflect_on_association(association).klass.new
-        fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
-          render("comable/admin/shared/#{association.to_s.singularize}_fields", ff: builder)
-        end
-        link_to(name, 'javascript:void(0)', options.merge(onclick: "add_fields(this, '#{association}', '#{escape_javascript(fields)}')"))
+      def link_to_add_fields(name, f, type, options = {})
+        new_fields = build_fields(f, type)
+        link_to(name, 'javascript:void(0)', options.merge(class: "add_fields #{options[:class]}", 'data-field-type' => type, 'data-content' => "#{new_fields}"))
       end
 
       def button_to_remove_fields(name, options = {})
-        content_tag(:button, name, options.merge(class: "ransack remove_fields #{options[:class]}"))
+        content_tag(:button, name, options.merge(class: "remove_fields #{options[:class]}"))
       end
 
       def button_to_add_fields(name, f, type, options = {})
         new_fields = build_fields(f, type)
-        content_tag(:button, name, options.merge(class: "ransack add_fields #{options[:class]}", 'data-field-type' => type, 'data-content' => "#{new_fields}"))
+        content_tag(:button, name, options.merge(class: "add_fields #{options[:class]}", 'data-field-type' => type, 'data-content' => "#{new_fields}"))
       end
 
       def build_fields(f, type)
-        new_object = f.object.send("build_#{type}")
-
-        f.send("#{type}_fields", new_object, child_index: "new_#{type}") do |builder|
-          render("comable/admin/shared/#{type}_fields", f: builder)
+        render_block = -> (builder) { render("comable/admin/shared/#{type}_fields", f: builder) }
+
+        if singular? type
+          new_object = f.object.send("build_#{type}")
+          f.send("#{type}_fields", new_object, child_index: "new_#{type}", &render_block)
+        else
+          new_object = f.object.send(type).build
+          f.send('fields_for', type, new_object, child_index: "new_#{type}", &render_block)
         end
       end
 
@@ -48,6 +49,12 @@ module Comable
       def page_name
         [controller_name, action_name].join(':')
       end
+
+      private
+
+      def singular?(string)
+        string.to_s.try(:singularize) == string.to_s
+      end
     end
   end
 end

data/app/helpers/comable/admin/navigations_helper.rb

@@ -0,0 +1,23 @@
+module Comable
+  module Admin
+    module NavigationsHelper
+      def linkable_type_options
+        Comable::NavigationItem.linkable_params_lists.map { |attr| attr.slice(:name, :type).values }
+      end
+
+      def linkable_id_options(navigation_item)
+        navigation_item.linkable_class.try(:linkable_id_options) || [[]]
+      end
+
+      # アイテム追加ボタン設置
+      def add_fields_button_tag(name, f, association)
+        new_object = f.object.send(association).klass.new
+        index = new_object.object_id # 後で置換するために必要な文字を入れる
+        fields = f.fields_for(association, new_object, child_index: index) do |builder|
+          render(association.to_s.singularize + '_fields', f: builder)
+        end
+        button_tag(name, type: :button, class: 'add_fields btn btn-default pull-right', data: { index: index, fields: fields.delete("\n") })
+      end
+    end
+  end
+end

data/app/helpers/comable/admin/themes_helper.rb

@@ -27,7 +27,7 @@ module Comable
 
       def load_directory_tree(path, parent = nil)
         children = []
-        tree = { (parent || :root)  => children }
+        tree = { (parent || :root) => children }
 
         Dir.foreach(path) do |entry|
           next if entry.start_with? '.'

data/{config/initializers/awesome_admin_layout.rb → app/navigations/comable/admin/application.rb}

@@ -1,8 +1,8 @@
-AwesomeAdminLayout.setup(only: Comable::Admin::ApplicationController) do |controller|
+AwesomeAdminLayout.define(only: Comable::Admin::ApplicationController) do |controller|
   comable = controller.comable
   current_comable_user = controller.current_comable_user
 
-  navigation do
+  navigation :admin do
     brand Comable.app_name do
       external_link comable.root_path
     end
@@ -47,7 +47,7 @@ AwesomeAdminLayout.setup(only: Comable::Admin::ApplicationController) do |contro
     brand Comable.t('admin.nav.product')
 
     item Comable.t('admin.nav.products.list') do
-      link comable.admin_products_path(hoge: 112)
+      link comable.admin_products_path
     end
 
     item Comable.t('admin.nav.stock') do
@@ -72,6 +72,10 @@ AwesomeAdminLayout.setup(only: Comable::Admin::ApplicationController) do |contro
       link comable.admin_pages_path
     end
 
+    item Comable.t('admin.nav.navigation') do
+      link comable.admin_navigations_path
+    end
+
     divider
 
     item Comable.t('admin.nav.shipment_method') do
@@ -104,7 +108,7 @@ AwesomeAdminLayout.setup(only: Comable::Admin::ApplicationController) do |contro
     divider
 
     item Comable.t('admin.sign_out') do
-      link comable.destroy_user_session_path, method: :delete
+      link comable.destroy_admin_user_session_path, method: :delete
     end
   end
 end