comable-backend 0.7.0.beta2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a4aab8272e2f6d7559b2b904eff5dae392ac9b
-  data.tar.gz: 6a467557d5063f57772c037adddabc6099bfce7a
+  metadata.gz: 468193b091875f22c8f2f66c4c7a39f4303514ea
+  data.tar.gz: 32459c209919309b128b318c4e3292aa84fb13d1
 SHA512:
-  metadata.gz: 74082e26be423fa71b1d3196d9daf07251b106665314a77bde732c3a77812bb63a27853149375dd8ee14f763e620107788328e657de86291782a5223603a9c61
-  data.tar.gz: cfa9c867269a22cb149cea5f1a5e69f67dd73fe40dc9b7e69985a0972bd5718a21ad8d17858a4e7a24dde9483096aa27e146ae4cd0e3faf6ef422c478db08cac
+  metadata.gz: 2fcf1ee77d9ef16c1a212ab958953cb7678ca29cead72042c9dd5864ce1a5ddad930f65676ef1c6dcba55a3acee473e428e907be633c24130e69d69d93b60dce
+  data.tar.gz: f54d0897d8ce819717a88661c35f189d384022df41f19f63de831ff626ec85ef433ec02d12c331a67251917b6d51fbf0065685b48851e4ead33723632347b07a

data/app/assets/javascripts/comable/admin/application.coffee

@@ -54,11 +54,12 @@ initialize_select2 = ->
     $select = $(this)
     options = { theme: 'bootstrap' }
     if $select.hasClass('ajax')
+      term_column = $select.data('term') || ['name_cont']
       options.ajax = {
         url: $select.data('source')
         dataType: 'json'
         cache: true
-        data: (params) -> { q: { name_cont: params.term }, page: params.page }
+        data: (params) -> { q: { "#{term_column}" : params.term }, page: params.page }
         processResults: (data, page) -> { results: data }
       }
     $select.select2(options)

data/app/assets/javascripts/comable/admin/dispatcher.coffee

@@ -15,7 +15,11 @@ class Dispatcher
     action_name = path[1]
 
     switch page
-      when 'orders:edit', 'pages:update'
+      when 'draft_orders:new', 'draft_orders:create', 'draft_orders:edit', 'draft_orders:update'
+        new OrderItemBuilder
+        new UserSelector
+        new DynamicOrder
+      when 'orders:new', 'orders:create', 'orders:edit', 'orders:update'
         new DynamicOrder
       when 'pages:new', 'pages:show', 'pages:edit', 'pages:update', 'pages:create'
         new Page

data/app/assets/javascripts/comable/admin/{orders.coffee → dynamic_order.coffee}

@@ -7,7 +7,7 @@ class @DynamicOrder
 
   listen_events: ->
     self = this
-    $('input').on('change', ->
+    $(document).on('change', 'input', ->
       attribute_name = $(this).attr('data-name')
       return unless jQuery.inArray(attribute_name, self.refresh_trigger_attributes)
       self.refresh_order_item_prices_for(this)
@@ -18,7 +18,7 @@ class @DynamicOrder
 
     $price = $group.find('[data-name="price"]')
     $quantity = $group.find('[data-name="quantity"]')
-    $subtotal_price = $group.find('[data-name="subtotal_price"]')
+    $subtotal_price = $group.find('[data-name="subtotal-price"]')
 
     price = Number($price.val())
     quantity = Number($quantity.val())
@@ -28,14 +28,14 @@ class @DynamicOrder
 
   refresh_order_prices: ->
     item_total_price = 0
-    $('[data-name="subtotal_price"]').each( ->
+    $('[data-name="subtotal-price"]').each( ->
       item_total_price += Number($(this).val())
     )
 
-    $item_total_price = $('[data-name="item_total_price"]')
-    $payment_fee = $('[data-name="payment_fee"]')
-    $shipment_fee = $('[data-name="shipment_fee"]')
-    $total_price = $('[data-name="total_price"]')
+    $item_total_price = $('[data-name="item-total-price"]')
+    $payment_fee = $('[data-name="payment-fee"]')
+    $shipment_fee = $('[data-name="shipment-fee"]')
+    $total_price = $('[data-name="total-price"]')
 
     payment_fee = Number($payment_fee.val())
     shipment_fee = Number($shipment_fee.val())

data/app/assets/javascripts/comable/admin/order_item_builder.coffee

@@ -0,0 +1,42 @@
+class @OrderItemBuilder
+  NEW_ORDER_ITEM_SELECTOR = '.js-new-order-item'
+  LINK_TO_REMOVE_ORDER_ITEM_SELECTOR = '.js-remove-order-item'
+
+  constructor: ->
+    @setSelectors()
+    @$variantSelector.on('select2:select', (event) => @buildOrderItem(event.params.data))
+    $(document).on('click', LINK_TO_REMOVE_ORDER_ITEM_SELECTOR, (event) => @removeOrderItem(event.target))
+
+  setSelectors: ->
+    @$variantSelector = $('#js-variant-selector')
+    @$linkToAddOrderItem = $('#js-add-order-item')
+    @$orderItemsTable = $('#js-order-items-table').find('tbody')
+
+  buildOrderItem: (variant) ->
+    $orderItem = @newOrderItem()
+    @fillOrderItem($orderItem, variant)
+    @$orderItemsTable.append($orderItem)
+    @refreshPricesFor($orderItem)
+
+  # TODO: Commonize this method
+  newOrderItem: ->
+    newId = new Date().getTime()
+    @$linkToAddOrderItem.click()
+    $orderItem = $(NEW_ORDER_ITEM_SELECTOR).filter('.hidden').last()
+    $orderItem.removeClass('hidden')
+    $orderItem.html($orderItem.html().replace(/new_order_item/g, newId))
+    $orderItem
+
+  fillOrderItem: ($orderItem, variant) ->
+    $orderItem.find('[data-name="variant-id"]').val(variant.id)
+    $orderItem.find('[data-name="name"]').val(variant.text)
+    $orderItem.find('[data-name="sku"]').val(variant.sku)
+    $orderItem.find('[data-name="price"]').val(variant.price)
+    $orderItem.find('[data-name="subtotal-price"]').val(variant.price)
+    $orderItem.find('[data-name="image-url"]').attr('src', variant.image_url)
+
+  removeOrderItem: (element) ->
+    $(element).closest(NEW_ORDER_ITEM_SELECTOR).remove()
+
+  refreshPricesFor: ($orderItem) ->
+    $orderItem.find('[data-name="price"]').trigger('change')

data/app/assets/javascripts/comable/admin/user_selector.coffee

@@ -0,0 +1,15 @@
+class @UserSelector
+  constructor: ->
+    @setSelectors()
+    @$userSelector.on('select2:select', (event) => @fillUser(event.params.data))
+
+  setSelectors: ->
+    @$userSelector = $('#js-user-selector')
+    @$user = $('#js-user-fields')
+
+  fillUser: (user) ->
+    @$user.find('[data-name="email"]').val(user.email)
+    @$user.find('[data-name="bill-family-name"]').val(user.bill_address.family_name)
+    @$user.find('[data-name="bill-first-name"]').val(user.bill_address.first_name)
+    @$user.find('[data-name="bill-zip-code"]').val(user.bill_address.zip_code)
+    @$user.find('[data-name="bill-state-name"]').val(user.bill_address.state_name)

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

@@ -0,0 +1,88 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class DraftOrdersController < Comable::Admin::ApplicationController
+      include Comable::PermittedAttributes
+
+      load_and_authorize_resource :order, parent: false, class: Comable::DraftOrder.name
+
+      def index
+        @q = Comable::Order.draft.ransack(params[:q])
+        @orders = @q.result.page(params[:page]).per(15).recent.accessible_by(current_ability)
+      end
+
+      def show
+        render :edit
+      end
+
+      def new
+        build_associations
+      end
+
+      def create
+        if save_order_as_draft
+          @order.update!(draft: false) if @order.completed?
+          redirect_to admin_order_path, notice: Comable.t('successful')
+        else
+          build_associations
+          flash.now[:alert] = Comable.t('failure')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        @order.attributes = order_params
+
+        if save_order_as_draft
+          @order.update!(draft: false) if @order.completed?
+          redirect_to admin_order_path, notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      private
+
+      def admin_order_path
+        if @order.draft?
+          comable.admin_draft_order_path(@order)
+        else
+          comable.admin_order_path(@order)
+        end
+      end
+
+      def save_order_as_draft
+        @order.next_draft_state
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def order_params
+        params.require(:order).permit(
+          :id,
+          :user_id,
+          :email,
+          :same_as_bill_address,
+          bill_address_attributes: permitted_address_attributes,
+          ship_address_attributes: permitted_address_attributes,
+          order_items_attributes: [:id, :name, :sku, :price, :quantity, :variant_id],
+          payment_attributes: [:id, :_destroy, :payment_method_id],
+          shipments_attributes: [:id, :_destroy, :shipment_method_id]
+        )
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def build_associations
+        @order.build_bill_address unless @order.bill_address
+        @order.build_ship_address unless @order.ship_address
+        @order.build_payment unless @order.payment
+      end
+    end
+  end
+end

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

@@ -18,6 +18,10 @@ module Comable
       def show
       end
 
+      def new
+        redirect_to comable.new_admin_draft_order_path
+      end
+
       def edit
       end
 
@@ -87,7 +91,7 @@ module Comable
           :total_price,
           bill_address_attributes: permitted_address_attributes,
           ship_address_attributes: permitted_address_attributes,
-          order_items_attributes: [:id, :name, :code, :price, :quantity]
+          order_items_attributes: [:id, :name, :price, :quantity]
         )
       end
 

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

@@ -10,6 +10,11 @@ module Comable
       def index
         @q = Comable::User.ransack(params[:q])
         @users = @q.result.page(params[:page]).accessible_by(current_ability).by_newest
+
+        respond_to do |format|
+          format.html
+          format.json { render json: @users }
+        end
       end
 
       def show

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

@@ -3,12 +3,20 @@ 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
+      # for /admin/variants
+      load_and_authorize_resource :variant, class: Comable::Variant.name, only: :index
+
+      # for /admin/products/:product_id/variants/:id
+      load_and_authorize_resource :product, class: Comable::Product.name, except: :index
+      load_and_authorize_resource :variant, class: Comable::Variant.name, except: :index, through: :product
 
       def index
         @q = @variants.ransack(params[:q])
         @variants = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability).by_newest
+
+        respond_to do |format|
+          format.json { render json: @variants }
+        end
       end
 
       def show

data/app/navigations/comable/admin/application.rb

@@ -13,7 +13,7 @@ AwesomeAdminLayout.define(only: Comable::Admin::ApplicationController) do |contr
     end
 
     item Comable.t('admin.nav.order') do
-      link comable.admin_orders_path
+      nest :orders
       icon 'shopping-cart'
     end
 
@@ -43,6 +43,18 @@ AwesomeAdminLayout.define(only: Comable::Admin::ApplicationController) do |contr
     end
   end
 
+  navigation :orders do
+    brand Comable.t('admin.nav.order')
+
+    item Comable.t('admin.nav.order') do
+      link comable.admin_orders_path
+    end
+
+    item Comable.t('admin.nav.draft_order') do
+      link comable.admin_draft_orders_path
+    end
+  end
+
   navigation :products do
     brand Comable.t('admin.nav.product')
 

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

@@ -0,0 +1,179 @@
+= error_messages_for @order
+
+= form_for [comable, :admin, :draft, @order] do |f|
+  .hidden
+    = f.submit
+
+  .col-md-6
+    .row
+      fieldset
+        .col-md-3
+          legend
+            = f.object.class.human_attribute_name(:order_items)
+          .help-block
+
+        .col-md-9
+          - if @order.new_record?
+            .form-group
+              = select_tag :variant, nil, id: 'js-variant-selector', class: 'select2 ajax', data: { source: comable.admin_variants_path, term: :product_name_cont }
+              = link_to_add_fields nil, f, :order_items, id: 'js-add-order-item', class: 'hidden'
+
+          table.table#js-order-items-table
+            thead
+              tr
+                th colspan="2"
+                  = f.object.order_items.klass.human_attribute_name(:product)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:price)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:quantity)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:subtotal_price)
+            tbody
+              = f.fields_for :order_items do |ff|
+                = render 'comable/admin/shared/order_items_fields', f: ff
+            tfoot
+              tr
+                th.text-right colspan="4"
+                  = f.object.class.human_attribute_name(:item_total_price)
+                td
+                  = f.text_field :item_total_price, disabled: true, data: { name: 'item-total-price' }
+
+          .form-group
+            = f.fields_for :payment do |ff|
+              .panel.panel-default
+                .panel-heading
+                  = f.object.class.human_attribute_name(:payment_method)
+
+                ul.list-group
+                  = ff.collection_radio_buttons :payment_method_id, Comable::PaymentMethod.all, :id, :name do |b|
+                    li.list-group-item
+                      .radio
+                        = b.label do
+                          = b.radio_button
+                          strong
+                            = b.text
+                      p
+                        = "#{b.object.class.human_attribute_name(:fee)}: "
+                        = number_to_currency b.object.fee
+
+          - if @order.shipment?
+            .form-group
+              = f.fields_for :shipments do |ff|
+                .panel.panel-default
+                  .panel-heading
+                    | #{f.object.class.human_attribute_name(:shipment_method)} ##{ff.index.next}
+
+                  ul.list-group
+                    = ff.collection_radio_buttons :shipment_method_id, Comable::ShipmentMethod.all, :id, :name do |b|
+                      li.list-group-item
+                        .radio
+                          = b.label do
+                            = b.radio_button
+                            strong
+                              = b.text
+                        p
+                          = "#{b.object.class.human_attribute_name(:fee)}: "
+                          = number_to_currency b.object.fee
+
+  .col-md-6#js-user-fields
+    .row
+      fieldset
+        .col-md-3
+          legend
+            = Comable.t('admin.user')
+          .help-block
+
+        .col-md-9
+          - if @order.new_record?
+            .form-group
+              = f.collection_select :user_id, [@order.user].compact, :id, :text, {}, id: 'js-user-selector', class: 'select2 ajax', data: { source: comable.admin_users_path, term: :email_or_bill_address_full_name_cont }
+
+          .form-group
+            = f.label :email
+            = f.email_field :email, data: { name: 'email' }
+
+      - if f.object.bill_address
+        hr
+
+        fieldset
+          .col-md-3
+            legend
+              = f.object.class.human_attribute_name(:bill_address)
+            .help-block
+
+          .col-md-9
+            = f.fields_for :bill_address do |ff|
+              .form-group
+                = ff.label :full_name
+                .row
+                  .col-sm-6
+                    = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name), data: { name: 'bill-family-name' }
+                  .col-sm-6
+                    = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name), data: { name: 'bill-first-name' }
+
+              .form-group
+                = ff.label :zip_code
+                = ff.text_field :zip_code, max_length: 8, data: { name: 'bill-zip-code' }
+
+              .form-group
+                = ff.label :state_name
+                = ff.text_field :state_name, data: { name: 'bill-state-name' }
+
+              .form-group
+                = ff.label :city
+                = ff.text_field :city, data: { name: 'bill-city' }
+
+              .form-group
+                = ff.label :detail
+                = ff.text_field :detail, data: { name: 'bill-detail' }
+
+              .form-group
+                = ff.label :phone_number
+                = ff.text_field :phone_number, max_length: 18, data: { name: 'bill-phone-number' }
+
+      - if f.object.ship_address
+        hr
+
+        fieldset
+          .col-md-3
+            legend
+              = f.object.class.human_attribute_name(:ship_address)
+            .help-block
+
+          .col-md-9
+            .form-group
+              .checkbox
+                label
+                  = f.check_box :same_as_bill_address, data: { name: 'same-as-bill-address' }
+                  = f.object.class.human_attribute_name(:same_as_bill_address)
+
+            #js-ship-address-fields
+              = f.fields_for :ship_address do |ff|
+                .form-group
+                  = ff.label :full_name
+                  .row
+                    .col-sm-6
+                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name), data: { name: 'ship-family-name' }
+                    .col-sm-6
+                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name), data: { name: 'ship-first-name' }
+
+                .form-group
+                  = ff.label :zip_code
+                  = ff.text_field :zip_code, max_length: 8, data: { name: 'ship-zip-code' }
+
+                .form-group
+                  = ff.label :state_name
+                  = ff.text_field :state_name, data: { name: 'ship-state-name' }
+
+                .form-group
+                  = ff.label :city
+                  = ff.text_field :city, data: { name: 'ship-city' }
+
+                .form-group
+                  = ff.label :detail
+                  = ff.text_field :detail, data: { name: 'ship-detail' }
+
+                .form-group
+                  = ff.label :phone_number
+                  = ff.text_field :phone_number, max_length: 18, data: { name: 'ship-phone-number' }

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

@@ -0,0 +1,18 @@
+.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.draft_order'), comable.admin_draft_orders_path
+          li>
+            = link_to @order.code, comable.admin_draft_order_path(@order)
+          li.active
+            = Comable.t('admin.actions.edit')
+
+  .comable-page-body
+    = render 'form'

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

@@ -0,0 +1,92 @@
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        .btn-group role="group"
+          = link_to_previous_page @orders, '<', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | <
+          = link_to_next_page @orders, '>', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | >
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_draft_order_path, class: 'btn btn-default'
+      li.dropdown
+        = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
+          = Comable.t('admin.more')
+          i.fa.fa-angle-down<
+
+    h1.page-header
+      = Comable.t('admin.nav.draft_order')
+      small<
+        | #{@orders.total_count} #{Comable.t('admin.results')}
+
+  .comable-page-body
+    .comable-search
+      = search_form_for @q, url: comable.admin_draft_orders_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.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
+              li
+                = link_to Comable.t('admin.clear_search_conditions'), comable.admin_draft_orders_path
+          = f.text_field :code_cont, class: 'form-control'
+          span.input-group-btn
+            = f.submit Comable.t('admin.search'), class: 'btn btn-default'
+        .hidden
+          = f.label :user_id
+          = f.text_field :user_id_eq
+
+        = render 'comable/admin/shared/advanced_search', f: f
+
+    section
+      - if @orders.empty?
+        = Comable.t('admin.not_found')
+      - else
+        table.table.table-striped
+          thead
+            th
+              = sort_link [:comable, @q], :code
+            th
+              = sort_link [:comable, @q], :state
+            th
+              = @orders.klass.human_attribute_name(:payment_state)
+            th
+              = @orders.klass.human_attribute_name(:shipment_state)
+            th
+              = @orders.klass.human_attribute_name(:bill_full_name)
+            th
+              = @orders.klass.human_attribute_name(:order_items)
+            th
+              = sort_link [:comable, @q], :total_price
+            th
+              = sort_link [:comable, @q], :created_at
+          tbody
+            - @orders.each do |order|
+              tr
+                td
+                  = link_to order.code, comable.admin_draft_order_path(order)
+                td
+                  = order.human_state_name
+                td
+                  = order.payment_human_state_name
+                td
+                  = order.shipment_human_state_name
+                td
+                  = order.bill_full_name
+                td
+                  ul.list-unstyled
+                    - order.order_items.each do |order_item|
+                      li
+                        | #{order_item.name_with_sku} x #{order_item.quantity}
+                td
+                  = number_to_currency order.total_price
+                td
+                  = l order.created_at
+
+        .text-center
+          = paginate @orders, theme: :comable_backend

data/app/views/comable/admin/draft_orders/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.draft_order'), comable.admin_draft_orders_path
+          li.active
+            = Comable.t('admin.actions.new')
+
+  .comable-page-body
+    = render 'form'

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

@@ -0,0 +1,157 @@
+= error_messages_for @order
+
+= form_for [comable, :admin, @order] do |f|
+  .hidden
+    = f.submit
+
+  .col-md-6
+    .row
+      fieldset
+        .col-md-3
+          legend
+            = f.object.class.human_attribute_name(:order_items)
+          .help-block
+
+        .col-md-9
+          - if @order.new_record?
+            .form-group
+              = select_tag :variant, nil, id: 'js-variant-selector', class: 'select2 ajax', data: { source: comable.admin_variants_path, term: :product_name_cont }
+              = link_to_add_fields nil, f, :order_items, id: 'js-add-order-item', class: 'hidden'
+
+          table.table#js-order-items-table
+            thead
+              tr
+                th colspan="2"
+                  = f.object.order_items.klass.human_attribute_name(:product)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:price)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:quantity)
+                th
+                  = f.object.order_items.klass.human_attribute_name(:subtotal_price)
+            tbody
+              = f.fields_for :order_items do |ff|
+                = render 'comable/admin/shared/order_items_fields', f: ff
+            tfoot
+              tr
+                th.text-right colspan="4"
+                  = f.object.class.human_attribute_name(:item_total_price)
+                td
+                  = f.text_field :item_total_price, disabled: true, data: { name: 'item-total-price' }
+              tr
+                th.text-right colspan="4"
+                  = f.object.class.human_attribute_name(:payment_fee)
+                td
+                  = f.text_field :payment_fee, data: { name: 'payment-fee' }
+              tr
+                th.text-right colspan="4"
+                  = f.object.class.human_attribute_name(:shipment_fee)
+                td
+                  = f.text_field :shipment_fee, data: { name: 'shipment-fee' }
+              tr
+                th.text-right colspan="4"
+                  = f.object.class.human_attribute_name(:total_price)
+                td
+                  = f.text_field :total_price, disabled: true, data: { name: 'total-price' }
+
+  .col-md-6#js-user-fields
+    .row
+      fieldset
+        .col-md-3
+          legend
+            = Comable.t('admin.user')
+          .help-block
+
+        .col-md-9
+          - if @order.new_record?
+            .form-group
+              = f.collection_select :user_id, [@order.user].compact, :id, :text, {}, id: 'js-user-selector', class: 'select2 ajax', data: { source: comable.admin_users_path, term: :email_or_bill_address_full_name_cont }
+
+          .form-group
+            = f.label :email
+            = f.email_field :email, data: { name: 'email' }
+
+      - if f.object.bill_address
+        hr
+
+        fieldset
+          .col-md-3
+            legend
+              = f.object.class.human_attribute_name(:bill_address)
+            .help-block
+
+          .col-md-9
+            = f.fields_for :bill_address do |ff|
+              .form-group
+                = ff.label :full_name
+                .row
+                  .col-sm-6
+                    = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name), data: { name: 'bill-family-name' }
+                  .col-sm-6
+                    = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name), data: { name: 'bill-first-name' }
+
+              .form-group
+                = ff.label :zip_code
+                = ff.text_field :zip_code, max_length: 8, data: { name: 'bill-zip-code' }
+
+              .form-group
+                = ff.label :state_name
+                = ff.text_field :state_name, data: { name: 'bill-state-name' }
+
+              .form-group
+                = ff.label :city
+                = ff.text_field :city, data: { name: 'bill-city' }
+
+              .form-group
+                = ff.label :detail
+                = ff.text_field :detail, data: { name: 'bill-detail' }
+
+              .form-group
+                = ff.label :phone_number
+                = ff.text_field :phone_number, max_length: 18, data: { name: 'bill-phone-number' }
+
+      - if f.object.ship_address
+        hr
+
+        fieldset
+          .col-md-3
+            legend
+              = f.object.class.human_attribute_name(:ship_address)
+            .help-block
+
+          .col-md-9
+            .form-group
+              .checkbox
+                label
+                  = f.check_box :same_as_bill_address, data: { name: 'same-as-bill-address' }
+                  = f.object.class.human_attribute_name(:same_as_bill_address)
+
+            #js-ship-address-fields
+              = f.fields_for :ship_address do |ff|
+                .form-group
+                  = ff.label :full_name
+                  .row
+                    .col-sm-6
+                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name), data: { name: 'ship-family-name' }
+                    .col-sm-6
+                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name), data: { name: 'ship-first-name' }
+
+                .form-group
+                  = ff.label :zip_code
+                  = ff.text_field :zip_code, max_length: 8, data: { name: 'ship-zip-code' }
+
+                .form-group
+                  = ff.label :state_name
+                  = ff.text_field :state_name, data: { name: 'ship-state-name' }
+
+                .form-group
+                  = ff.label :city
+                  = ff.text_field :city, data: { name: 'ship-city' }
+
+                .form-group
+                  = ff.label :detail
+                  = ff.text_field :detail, data: { name: 'ship-detail' }
+
+                .form-group
+                  = ff.label :phone_number
+                  = ff.text_field :phone_number, max_length: 18, data: { name: 'ship-phone-number' }

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

@@ -15,156 +15,4 @@
             = Comable.t('admin.actions.edit')
 
   .comable-page-body
-    section
-      = error_messages_for @order
-
-      = form_for @order, url: comable.admin_order_path(@order) do |f|
-        .hidden
-          = f.submit
-
-        fieldset
-          .col-md-3
-            legend
-              = Comable.t('admin.general')
-            .help-block
-
-          .col-md-9
-            .form-group
-              = f.label :email
-              = f.email_field :email
-
-        - if f.object.bill_address
-          hr
-
-          fieldset
-            .col-md-3
-              legend
-                = f.object.class.human_attribute_name(:bill_address)
-              .help-block
-
-            .col-md-9
-              = f.fields_for :bill_address do |ff|
-                .form-group
-                  = ff.label :full_name
-                  .row
-                    .col-sm-6
-                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name)
-                    .col-sm-6
-                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name)
-
-                .form-group
-                  = ff.label :zip_code
-                  = ff.text_field :zip_code, max_length: 8
-
-                .form-group
-                  = ff.label :state_name
-                  = ff.text_field :state_name
-
-                .form-group
-                  = ff.label :city
-                  = ff.text_field :city
-
-                .form-group
-                  = ff.label :detail
-                  = ff.text_field :detail
-
-                .form-group
-                  = ff.label :phone_number
-                  = ff.text_field :phone_number, max_length: 18
-
-        - if f.object.ship_address
-          hr
-
-          fieldset
-            .col-md-3
-              legend
-                = f.object.class.human_attribute_name(:ship_address)
-              .help-block
-
-            .col-md-9
-              = f.fields_for :ship_address do |ff|
-                .form-group
-                  = ff.label :full_name
-                  .row
-                    .col-sm-6
-                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name)
-                    .col-sm-6
-                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name)
-
-                .form-group
-                  = ff.label :zip_code
-                  = ff.text_field :zip_code, max_length: 8
-
-                .form-group
-                  = ff.label :state_name
-                  = ff.text_field :state_name
-
-                .form-group
-                  = ff.label :city
-                  = ff.text_field :city
-
-                .form-group
-                  = ff.label :detail
-                  = ff.text_field :detail
-
-                .form-group
-                  = ff.label :phone_number
-                  = ff.text_field :phone_number, max_length: 18
-
-        - if f.object.order_items
-          hr
-
-          fieldset
-            .col-md-3
-              legend
-                = f.object.class.human_attribute_name(:order_items)
-              .help-block
-
-            .col-md-9
-              table.table
-                thead
-                  tr
-                    th colspan="2"
-                      = f.object.order_items.klass.human_attribute_name(:product)
-                    th
-                      = f.object.order_items.klass.human_attribute_name(:price)
-                    th
-                      = f.object.order_items.klass.human_attribute_name(:quantity)
-                    th
-                      = f.object.order_items.klass.human_attribute_name(:subtotal_price)
-                tbody
-                  = f.fields_for :order_items do |ff|
-                    tr.comable-order-items
-                      td width="180"
-                        = image_tag ff.object.image_url, width: '100%'
-                      td
-                        p
-                          = ff.text_field :name, placeholder: ff.object.class.human_attribute_name(:name), data: { name: 'name' }
-                        p.text-muted
-                          = ff.text_field :sku, placeholder: ff.object.class.human_attribute_name(:sku), data: { name: 'sku' }
-                      td
-                        = ff.text_field :price, placeholder: ff.object.class.human_attribute_name(:price), data: { name: 'price' }
-                      td
-                        = ff.text_field :quantity, placeholder: ff.object.class.human_attribute_name(:quantity), data: { name: 'quantity' }
-                      td
-                        = ff.text_field :subtotal_price, disabled: true, data: { name: 'subtotal_price' }
-                  tr
-                    th.text-right colspan="4"
-                      = f.object.class.human_attribute_name(:item_total_price)
-                    td
-                      = f.text_field :item_total_price, disabled: true, data: { name: 'item_total_price' }
-                  tr
-                    th.text-right colspan="4"
-                      = f.object.class.human_attribute_name(:payment_fee)
-                    td
-                      = f.text_field :payment_fee, data: { name: 'payment_fee' }
-                  tr
-                    th.text-right colspan="4"
-                      = f.object.class.human_attribute_name(:shipment_fee)
-                    td
-                      = f.text_field :shipment_fee, data: { name: 'shipment_fee' }
-                  tr
-                    th.text-right colspan="4"
-                      = f.object.class.human_attribute_name(:total_price)
-                    td
-                      = f.text_field :total_price, disabled: true, data: { name: 'total_price' }
+    = render 'form'

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

@@ -9,6 +9,8 @@
           = link_to_next_page @orders, '>', class: 'btn btn-default' do
             .btn.btn-default disabled="disabled"
               | >
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_order_path, class: 'btn btn-default'
       li.dropdown
         = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
           = Comable.t('admin.more')

data/app/views/comable/admin/orders/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.order'), comable.admin_orders_path
+          li.active
+            = Comable.t('admin.actions.new')
+
+  .comable-page-body
+    = render 'form'

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

@@ -6,11 +6,11 @@
         = link_to comable.ship_admin_order_path(@order), class: 'btn btn-primary', method: :post, disabled: !@order.can_ship? do
           i.fa.fa-truck>
           = Comable.t('admin.ship')
-      - if @order.completed?
+      - if @order.can_cancel?
         li
           = link_to comable.cancel_admin_order_path(@order), class: 'btn btn-default', method: :post do
             = @order.class.human_state_event_name(:cancel)
-      - if @order.canceled?
+      - if @order.can_resume?
         li
           = button_to comable.resume_admin_order_path(@order), class: 'btn btn-default', method: :post do
             = @order.class.human_state_event_name(:resume)

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

@@ -10,8 +10,7 @@
             .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'
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_product_path, class: 'btn btn-default'
       li.dropdown
         = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
           = Comable.t('admin.more')

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

@@ -0,0 +1,20 @@
+- dynamic_field = f.index.is_a? String
+- css_class = ['js-new-order-item', 'hidden'].join(' ') if dynamic_field
+
+tr.comable-order-items class="#{css_class}"
+  td width="180"
+    = image_tag f.object.image_url, width: '100%', data: { name: 'image-url' }
+  td
+    p
+      = f.text_field :name, placeholder: f.object.class.human_attribute_name(:name), data: { name: 'name' }
+    p.text-muted
+      = f.text_field :sku, placeholder: f.object.class.human_attribute_name(:sku), data: { name: 'sku' }
+  td
+    = f.text_field :price, placeholder: f.object.class.human_attribute_name(:price), data: { name: 'price' }
+  td
+    = f.text_field :quantity, placeholder: f.object.class.human_attribute_name(:quantity), data: { name: 'quantity' }
+  td
+    = f.text_field :subtotal_price, disabled: true, data: { name: 'subtotal-price' }
+    br
+    = f.text_field :variant_id, data: { name: 'variant-id' }, class: 'hidden'
+    = link_to Comable.t('admin.actions.destroy'), 'javascript:void(0)', class: 'js-remove-order-item'

data/config/routes.rb

@@ -5,7 +5,7 @@ Comable::Core::Engine.routes.draw do
     resource :dashboard, only: :show
 
     resources :products do
-      resources :variants
+      resources :variants, except: :index
 
       resources :stocks
 
@@ -22,7 +22,9 @@ Comable::Core::Engine.routes.draw do
       end
     end
 
-    resources :orders do
+    resources :variants, only: :index
+
+    resources :orders, except: :create do
       collection do
         get :export
       end
@@ -38,6 +40,8 @@ Comable::Core::Engine.routes.draw do
       end
     end
 
+    resources :draft_orders
+
     resources :categories
     resources :stock_locations
     resources :pages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable-backend
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta2
+  version: 0.7.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.beta2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.beta2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -487,13 +487,15 @@ files:
 - app/assets/javascripts/comable/admin/categories.coffee
 - app/assets/javascripts/comable/admin/dashboard.coffee
 - app/assets/javascripts/comable/admin/dispatcher.coffee
+- app/assets/javascripts/comable/admin/dynamic_order.coffee
 - app/assets/javascripts/comable/admin/navigations.coffee
-- app/assets/javascripts/comable/admin/orders.coffee
+- app/assets/javascripts/comable/admin/order_item_builder.coffee
 - app/assets/javascripts/comable/admin/pages.coffee
 - app/assets/javascripts/comable/admin/products.coffee
 - app/assets/javascripts/comable/admin/search.coffee
 - app/assets/javascripts/comable/admin/stocks.coffee
 - app/assets/javascripts/comable/admin/themes.coffee
+- app/assets/javascripts/comable/admin/user_selector.coffee
 - app/assets/javascripts/comable/admin/variants.coffee
 - app/assets/stylesheets/comable/admin/_common.scss
 - app/assets/stylesheets/comable/admin/_dashboard.scss
@@ -517,6 +519,7 @@ files:
 - app/controllers/comable/admin/application_controller.rb
 - app/controllers/comable/admin/categories_controller.rb
 - app/controllers/comable/admin/dashboard_controller.rb
+- app/controllers/comable/admin/draft_orders_controller.rb
 - app/controllers/comable/admin/navigations_controller.rb
 - app/controllers/comable/admin/orders_controller.rb
 - app/controllers/comable/admin/pages_controller.rb
@@ -543,17 +546,23 @@ files:
 - app/views/comable/admin/categories/index.slim
 - app/views/comable/admin/dashboard/_widget.slim
 - app/views/comable/admin/dashboard/show.slim
+- app/views/comable/admin/draft_orders/_form.slim
+- app/views/comable/admin/draft_orders/edit.slim
+- app/views/comable/admin/draft_orders/index.slim
+- app/views/comable/admin/draft_orders/new.slim
 - app/views/comable/admin/navigations/_form.slim
 - app/views/comable/admin/navigations/_navigation_item_fields.slim
 - app/views/comable/admin/navigations/edit.slim
 - app/views/comable/admin/navigations/index.slim
 - app/views/comable/admin/navigations/new.slim
 - app/views/comable/admin/navigations/search_linkable_ids.coffee
+- app/views/comable/admin/orders/_form.slim
 - app/views/comable/admin/orders/_google_map.slim
 - app/views/comable/admin/orders/_payment_state.slim
 - app/views/comable/admin/orders/_shipment_state.slim
 - app/views/comable/admin/orders/edit.slim
 - app/views/comable/admin/orders/index.slim
+- app/views/comable/admin/orders/new.slim
 - app/views/comable/admin/orders/show.slim
 - app/views/comable/admin/pages/_form.slim
 - app/views/comable/admin/pages/edit.slim
@@ -577,6 +586,7 @@ files:
 - app/views/comable/admin/shared/_notifier.slim
 - app/views/comable/admin/shared/_option_type_fields.slim
 - app/views/comable/admin/shared/_option_types_fields.slim
+- app/views/comable/admin/shared/_order_items_fields.slim
 - app/views/comable/admin/shared/_stocks_fields.slim
 - app/views/comable/admin/shared/_value_fields.slim
 - app/views/comable/admin/shared/_variant_form.slim
@@ -612,7 +622,6 @@ files:
 - app/views/comable/admin/users/show.slim
 - app/views/comable/admin/variants/_form.slim
 - app/views/comable/admin/variants/edit.slim
-- app/views/comable/admin/variants/index.slim
 - app/views/comable/admin/variants/new.slim
 - app/views/kaminari/comable_backend/_first_page.html.slim
 - app/views/kaminari/comable_backend/_gap.html.slim
@@ -641,9 +650,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

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

@@ -1,97 +0,0 @@
-.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'
-      li.dropdown
-        = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
-          = Comable.t('admin.more')
-          i.fa.fa-angle-down<
-        ul.dropdown-menu.dropdown-menu-right
-          li
-            = link_to Comable.t('admin.export_to_csv'), comable.export_admin_products_path(format: :csv, q: params[:q])
-          li
-            = link_to Comable.t('admin.export_to_excel'), comable.export_admin_products_path(format: :xlsx, q: params[:q])
-          li.divider
-          li
-            a.btn-file
-              span>
-                = Comable.t('admin.import')
-              = form_tag comable.import_admin_products_path, multipart: true do
-                = file_field_tag :file
-
-    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.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 :name_or_variants_sku_cont_any_splitted, class: 'form-control'
-          span.input-group-btn
-            = f.submit Comable.t('admin.search'), class: 'btn btn-default'
-
-        = render 'comable/admin/shared/advanced_search', f: f
-
-    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
-              = 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)
-                  - unless product.published?
-                    span.fa.fa-eye-slash.text-muted<
-                td
-                  = product.name
-                td
-                  = number_to_currency product.price
-                td
-                  ul.list-unstyled
-                    - product.stocks.each do |stock|
-                      li
-                        strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
-                          = number_with_delimiter stock.quantity
-                        - if stock.sku?
-                          span<
-                            | (#{stock.sku_name})
-
-        .text-center
-          = paginate @products, theme: :comable_backend