rightnow_oms 0.1.2 → 0.1.3

data/app/assets/stylesheets/rightnow_oms/carts.css.scss

@@ -5,8 +5,6 @@
     &:hover { text-decoration: underline; }
   }
 }
-.r-clear { clear: both; }
-.r-money { color: red; }
 .r-mini-cart {
   @extend .r-links;
   position: relative;
@@ -33,22 +31,45 @@
     border: 1px solid #ccc;
     background-color: white;
     display: none;
-    table {
-      td {
-        padding: 5px 8px;
-        text-align: right;
-      }
-      td.name {
-        width: 150px;
-        text-align: left;
-        overflow: hidden;
-      }
-      td.money { @extend .money }
-      td.delete {
-        a {
-          color: #BF0000;
-        }
-      }
+    dl {
+      margin: 0px;
+      width: 100%;
+    }
+    dl ul {
+      list-style-type: none;
+      padding: 0px;
+      margin: 0px;
+      border: 0px;
+      width: 100%;
+    }
+    dl li{
+      padding-top: 5px;
+      padding-left: 8px;
+      text-align: right;
+      float: left;
+    }
+    dl li.name {
+      width: 165px;
+      text-align: left;
+      cursor: pointer;
+    }
+    dl li.price {
+      width: 50px;
+    }
+    dl li.delete {
+      width: 30px;
+    }
+    ul.child {
+      clear: both;
+    }
+    dd {
+      margin-left: 12px;
+    }
+    dd li.price {
+      margin-left: -12px;
+    }
+    dd li.name {
+      cursor: default;
     }
   }
   .r-bottom-bar {
@@ -65,74 +86,80 @@
   margin: 0 auto;
   font-size: 12px;
   background-color: white;
+
   h2 {
     font-size: 24px;
     line-height: 36px;
   }
-  table {
-    display: table;
+
+  ul {
+    text-align: left;
+    list-style-type: none;
+    border: 0px;
+    margin: 0px;
+    padding: 0px;
     width: 100%;
-    margin-bottom: 18px;
-    border-collapse: collapse;
-    border-spacing: 0;
-    vertical-align: middle;
-    tr:nth-child(odd) {
-      td { background-color: #F9F9F9; }
+
+    li {
+      padding: 12px 8px;
+      float: left;
     }
+    li.others {
+      float: right;
+      div {
+        float: left;
+      }
 
-    th, td {
-      padding: 8px;
-      line-height: 18px;
-      text-align: left;
-      display: table-cell;
-    }
-    thead {
-      display: table-header-group;
-      tr {
-        display: table-row;
-        th {
-          border-top: 0;
-          font-weight: bold;
-          vertical-align: bottom;
+      div.price {
+        width: 100px;
+      }
+
+      div.quantity {
+        width: 100px;
+        span {
+          border: 1px solid #CCC;
+          float: left;
+          display: block;
+          width: 14px;
+          text-align: center;
         }
+        span.decrease { margin-right: -1px; }
+        span.increase { margin-left: -1px; }
+        span.quantity { width: 30px; }
+        span.quantity-only { width: 60px; }
       }
+      div.subtotal { width: 85px; }
+      div.delete { width: 50px; }
     }
-    tbody {
-      display: table-row-group;
-      tr {
-        display: table-row;
-        td {
-          border-top: 1px solid #DDD;
-          vertical-align: top;
-        }
-        td.price    { width: 80px; }
-        td.quantity {
-          width: 100px;
-          span {
-            float: left;
-            text-align: center;
-            min-width: 12px;
-            border: 1px solid #CCC;
-            background-color: white;
-          }
-          span.quantity-only { width: 56px; }
-          span.quantity { width: 30px; }
-          span.increase {
-            margin-left: -1px;
-            a { text-decoration: none }
-          }
-          span.decrease {
-            margin-right: -1px;
-            a { text-decoration: none }
-          }
-        }
-        td.subtotal { width: 80px; }
-        td.delete   { width: 50px; }
+  }
+
+  ul.title {
+    font-size: 16px;
+    font-weight: bold;
+    li.price {
+      text-align: left;
+    }
+  }
+
+  dl {
+    margin: 0;
+    dt, dd {
+      margin: 0;
+      border-top: 1px solid #CCC;
+    }
+    dt ul {
+      li.name { cursor: pointer; }
+    }
+    dd {
+      background-color: #EEE;
+      ul {
+        li.name { padding-left: 20px; }
       }
     }
-    tfoot { display: none; }
   }
+
   .r-bottom-bar {
+    margin-top: 30px;
     position: relative;
     width: 100%;
     font-size: 20px;

data/app/assets/stylesheets/rightnow_oms/orders.css.scss

@@ -0,0 +1,50 @@
+.r-order {
+  margin: 0 auto;
+  max-width: 940px;
+  h3 { margin: 0px; }
+  p {
+    margin: 0px;
+    padding: 20px 20px;
+  }
+  label { font-weight: bold; }
+  table {
+    width: 100%;
+    margin-bottom: 18px;
+    border-collapse: collapse;
+    border-spacing: 0;
+    vertical-align: middle;
+    tr:nth-child(odd) {
+      td { background-color: #F9F9F9; }
+    }
+
+    th, td {
+      padding: 8px;
+      line-height: 18px;
+      text-align: left;
+    }
+    thead {
+      tr {
+        th {
+          border-top: 0;
+          font-weight: bold;
+          vertical-align: bottom;
+          padding-top: 20px;
+          padding-left: 20px;
+        }
+      }
+    }
+    tbody {
+      tr {
+        td {
+          padding-left: 20px;
+          border-top: 1px solid #DDD;
+          vertical-align: top;
+        }
+        td.price    { width: 80px; }
+        td.quantity { width: 100px; }
+        td.subtotal { width: 80px; }
+      }
+    }
+    tfoot { display: none; }
+  }
+}

data/app/controllers/rightnow_oms/cart_items_controller.rb

@@ -10,11 +10,6 @@ module RightnowOms
     end
 
     def create
-      if @cart.new_record?
-        @cart.save
-        session[:cart_id] = @cart.id
-      end
-
       params[:cart_item][:quantity] = 1 if params[:cart_item][:quantity].blank?
       cart_item = @cart.add_item(find_cartable, params[:cart_item])
 
@@ -28,6 +23,11 @@ module RightnowOms
     end
 
     def update
+      if params[:cart_item]
+        params[:cart_item].delete(:original_price)
+        params[:cart_item].delete(:base_quantity)
+      end
+
       respond_to do |format|
         if @cart_item.update_attributes(params[:cart_item])
           format.json { render_for_api :default, json: @cart_item, root: :cart_item, status: :ok }

data/app/controllers/rightnow_oms/orders_controller.rb

@@ -0,0 +1,30 @@
+module RightnowOms
+  class OrdersController < ApplicationController
+    before_filter :load_cart, only: :create
+
+    def show
+      @order = Order.find(params[:id])
+    end
+
+    def create
+      @order = Order.new_with_items(params[:order], get_order_items)
+
+      respond_to do |format|
+        if @order.save
+          @cart.destroy
+
+          format.html { redirect_to @order }
+        else
+          format.html { redirect_to ::RightnowOms.config.new_order_url }
+        end
+      end
+    end
+
+    private
+    def get_order_items
+      @cart.cart_items.inject([]) do |c, i|
+        c << { name: i.name, price: i.price, quantity: i.quantity }
+      end
+    end
+  end
+end

data/app/models/rightnow_oms/cart.rb

@@ -11,32 +11,41 @@ module RightnowOms
     end
 
     def total
-      cart_items.map.sum(&:total_price) || 0
+      cart_items.roots.map.sum(&:total) || 0
     end
 
     def cartable_count
-      cart_items.map.sum(&:quantity)
+      cart_items.roots.map.sum(&:quantity)
     end
 
-    def add_item(cartable, opts = { quantity: 1 })
-      cart_item = cart_items.find_by_cartable(cartable)
+    def add_item(cartable, opts = {})
+      quantity = opts[:quantity] || 1
+      mergable = true if opts[:mergable].nil?
+
+      return create_item(cartable, opts) unless mergable
 
+      cart_item = cart_items.find_by_cartable(cartable)
       if cart_item
         cart_item.update_attributes(
-          quantity: cart_item.quantity + opts[:quantity].to_i,
+          quantity: cart_item.quantity + quantity.to_i,
         )
       else
-        cart_item = cart_items.create(
-          cartable: cartable,
-          name: cartable.cartable_name,
-          price: opts[:price] || cartable.cartable_price,
-          quantity: opts[:quantity],
-          group: opts[:group],
-          parent_id: opts[:parent_id]
-        )
+        cart_item = create_item(cartable, opts)
       end
 
       cart_item
     end
+
+    private
+    def create_item(cartable, opts)
+      cart_items.create(
+        cartable: cartable,
+        name: cartable.cartable_name,
+        price: opts[:price] || cartable.cartable_price,
+        quantity: opts[:quantity] || 1,
+        group: opts[:group],
+        parent_id: opts[:parent_id]
+      )
+    end
   end
 end

data/app/models/rightnow_oms/cart_item.rb

@@ -12,6 +12,7 @@ module RightnowOms
     validates :name, presence: true
     validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :quantity, presence: true, numericality: { greater_than: 0 }
+    validates :base_quantity, presence: true, numericality: { greater_than: 0 }
 
     api_accessible :default do |t|
       t.add :id
@@ -19,21 +20,38 @@ module RightnowOms
       t.add :cartable_id
       t.add :cartable_type
       t.add :name
+      t.add :original_price
+      t.add :group
+      t.add :base_quantity
       t.add :price
       t.add :quantity
-      t.add :group
     end
 
     default_scope order("id ASC")
 
-    def total_price
+    before_validation :set_base_quantity
+
+    def total
       price * quantity
     end
 
+    def original_price
+      cartable.cartable_price
+    end
+
     class << self
+      def roots
+        where(parent_id: nil)
+      end
+
       def find_by_cartable(cartable)
         find_by_cartable_id_and_cartable_type(cartable.id, cartable.class)
       end
     end
+
+    private
+    def set_base_quantity
+      self.base_quantity = quantity unless base_quantity
+    end
   end
 end

data/app/models/rightnow_oms/order.rb

@@ -0,0 +1,43 @@
+module RightnowOms
+  class Order < ActiveRecord::Base
+    REQUIRED_ATTRS = %W(
+      province city district neighborhood room
+      receiver payment_mode order_items user_id
+    )
+
+    has_many :order_items
+
+    REQUIRED_ATTRS.each do |attr|
+      validates attr, presence: true
+    end
+
+    validate :validates_mobile_and_tel
+
+    def order_no
+      @generator ||= OrderNoGenerator.new(self)
+      @generator.generate
+    end
+
+    def delivery_address
+      "#{province}#{city}#{district}#{street}#{neighborhood}#{room}"
+    end
+
+    class << self
+      def new_with_items(base, items)
+        Order.new(base) do |o|
+          items.each do |i|
+            children = i.delete(:children)
+
+            oi = o.order_items.build(i.merge(order: o))
+            children.each { |c| oi.children.build(c.merge(order: o)) } if children
+          end
+        end
+      end
+    end
+
+    private
+    def validates_mobile_and_tel
+      errors[:base] = 'One of mobile and tel must be present.' unless self.mobile || self.tel
+    end
+  end
+end

data/app/models/rightnow_oms/order_item.rb

@@ -0,0 +1,16 @@
+module RightnowOms
+  class OrderItem < ActiveRecord::Base
+    belongs_to :order
+    belongs_to :parent, class_name: 'RightnowOms::OrderItem', foreign_key: :parent_id
+    has_many :children, class_name: 'RightnowOms::OrderItem', foreign_key: :parent_id, dependent: :destroy
+
+    validates :order, presence: true
+    validates :name, presence: true
+    validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :quantity, presence:true, numericality: { greater_than: 0 }
+
+    def total
+      price * quantity
+    end
+  end
+end

data/app/views/rightnow_oms/carts/show.html.haml

@@ -4,5 +4,7 @@
 
 :javascript
   $(function() {
+    RightnowOms.config.set('newOrderUrl', '#{RightnowOms.config.new_order_url}')
+
     RightnowOms.cartController.load(#{@cart.as_api_response(:default).to_json.html_safe});
   });

data/app/views/rightnow_oms/orders/show.html.haml

@@ -0,0 +1,45 @@
+.r-order
+  .r-order-no
+    %h3 订单号
+    %p= @order.order_no
+  .r-order-address
+    %h3 送货地址
+    %p= @order.delivery_address
+  .r-order-contact
+    %h3 联系方式
+    %p
+      %label 收货人姓名：
+      = @order.receiver
+      - unless @order.mobile.blank?
+        %label 手机：
+        = @order.mobile
+      - unless @order.tel.blank?
+        %label 电话：
+        = @order.tel
+  .r-order-payment
+    %h3 支付方式
+    %p= @order.payment_mode
+  .r-order-items
+    %h3 商品清单
+    %table
+      %thead
+        %tr
+          %th 名称
+          %th 价格
+          %th 数量
+          %th 小计
+      %tbody
+        - @order.order_items.each do |oi|
+          %tr
+            %td.name= oi.name
+            %td.price= "￥#{oi.price}"
+            %td.quantity= oi.quantity
+            %td.subtotal= "￥#{oi.total}"
+  - unless @order.remarks.blank?
+    .r-order-remarks
+      %h3 备注
+      %p= @order.remarks
+  - unless @order.vbrk.blank?
+    .r-order-vbrk
+      %h3 发票抬头
+      %p= @order.vbrk

data/config/routes.rb

@@ -1,4 +1,5 @@
 RightnowOms::Engine.routes.draw do
   resource :cart
   resources :cart_items
+  resources :orders
 end

data/db/migrate/20120214074943_create_rightnow_oms_orders.rb

@@ -0,0 +1,20 @@
+class CreateRightnowOmsOrders < ActiveRecord::Migration
+  def change
+    create_table :rightnow_oms_orders do |t|
+      t.string :province
+      t.string :city
+      t.string :district
+      t.string :street
+      t.string :neighborhood
+      t.string :room
+      t.string :receiver
+      t.string :mobile
+      t.string :tel
+      t.string :payment_mode
+      t.string :remarks
+      t.string :vbrk
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20120214081113_create_rightnow_oms_order_items.rb

@@ -0,0 +1,15 @@
+class CreateRightnowOmsOrderItems < ActiveRecord::Migration
+  def change
+    create_table :rightnow_oms_order_items do |t|
+      t.string :name
+      t.decimal :price, precision: 10, scale: 2
+      t.integer :quantity
+      t.integer :parent_id
+      t.belongs_to :order
+
+      t.timestamps
+    end
+    add_index :rightnow_oms_order_items, :parent_id
+    add_index :rightnow_oms_order_items, :order_id
+  end
+end

data/db/migrate/20120215064659_add_user_id_to_rightnow_oms_orders.rb

@@ -0,0 +1,7 @@
+class AddUserIdToRightnowOmsOrders < ActiveRecord::Migration
+  def change
+    add_column :rightnow_oms_orders, :user_id, :integer
+    add_index :rightnow_oms_orders, :user_id
+
+  end
+end

data/db/migrate/20120217081138_add_base_quantity_to_rightnow_oms_cart_items.rb

@@ -0,0 +1,6 @@
+class AddBaseQuantityToRightnowOmsCartItems < ActiveRecord::Migration
+  def change
+    add_column :rightnow_oms_cart_items, :base_quantity, :integer
+
+  end
+end

data/lib/rightnow_oms/order_no_generator.rb

@@ -0,0 +1,13 @@
+module RightnowOms
+  class OrderNoGenerator
+    NO_FORMAT = '%s%06d'
+
+    def initialize(order)
+      @order = order
+    end
+
+    def generate
+      NO_FORMAT % [@order.created_at.strftime('%Y%m%d'), @order.id]
+    end
+  end
+end

data/lib/rightnow_oms/version.rb

@@ -1,3 +1,3 @@
 module RightnowOms
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rightnow_oms.rb

@@ -1,9 +1,23 @@
-require "acts_as_api"
+require 'acts_as_api'
+require 'confstruct'
 
-require "rightnow_oms/engine"
-require "rightnow_oms/cartable_validator"
-require "rightnow_oms/acts_as_cartable"
-require "rightnow_oms/controller_helpers"
+require 'rightnow_oms/engine'
+require 'rightnow_oms/cartable_validator'
+require 'rightnow_oms/acts_as_cartable'
+require 'rightnow_oms/controller_helpers'
+require 'rightnow_oms/order_no_generator'
+
+module RightnowOms
+  @@config = ::Confstruct::Configuration.new
+
+  def self.config
+    @@config
+  end
+
+  def self.configure(&block)
+    @@config.configure(&block)
+  end
+end
 
 ActiveRecord::Base.extend(RightnowOms::ActsAsCartable)
 ActionController::Base.send(:include, RightnowOms::ControllerHelpers)