comable_core 0.3.4 → 0.4.0

data/config/locales/en.yml

@@ -83,7 +83,7 @@ en:
         dear: *honorific
         introductions: |-
           Thank you for shopping with %{store_name}.
-          Your order details:
+          Your order items:
         outroductions: |-
           We hope to see you again soon.
           %{store_name}
@@ -129,26 +129,41 @@ en:
       add_sub_image: 'Add a sub image'
       sign_in: 'Login'
       sign_out: 'Logout'
+      export_to_csv: 'Export to CSV'
+      export_to_excel: 'Export to Excel'
+      import: 'Import from file...'
+      unknown_file_type: 'Unknown file type: %{filename}'
+      is_not_exists: 'is not exists.'
+      ship: 'Ship'
+      help: 'Help'
+      tracker_code_help_introduction: |-
+        You can embed a Tracking ID, Order Information and many others by using a special symbol to Tracking code.
+        For example, you can embed Total Price of the order by writing <code>{{order.total_price}}</code>.
+        It will outputs as <code>1500</code> on the actual page.
+      tracker_code_help_additional: '<code>order.order_items</code> is Array. And you can retrieve the following information from each element.'
+      list_of_usable_variables: 'Available variables are as follows.'
+      mote_infomation_for_syntax: 'For more information about the syntax please refer to the following page:'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
         product: 'Products'
         stock: 'Stocks'
         category: 'Categories'
-        customer: 'Users'
+        user: 'Users'
         general_settings: 'General settings'
         store: 'Store'
         shipment_method: 'Shipment methods'
         payment_method: 'Payment methods'
+        tracker: 'Tracker'
         products:
           detail: 'Product details'
         orders:
           detail: 'Order details'
           cart: 'Cart infomation'
-          customer: 'User details'
+          user: 'User details'
           shipment: 'Shipment fee'
           payment: 'Payment charge'
-        customers:
+        users:
           detail: 'User details'
           edit: 'Editing user'
           new_orders: 'Recently orders (%{count})'
@@ -180,14 +195,35 @@ en:
             shipment: 'Shipment method'
             payment: 'Payment method'
             confirm: 'Order confirmed'
-            complete: 'Order placed'
+            completed: 'Order placed'
+            canceled: 'Canceled'
+            resumed: 'Resumed'
+          events:
+            cancel: 'Cancel'
+            resume: 'Resume'
+      comable/payment:
+        state:
+          states:
+            pending: 'Pending'
+            ready: 'Authorized'
+            completed: 'Completed'
+            canceled: 'Canceled'
+            resumed: 'Resumed'
+      comable/shipment:
+        state:
+          states:
+            pending: 'Pending'
+            ready: 'Ready'
+            completed: 'Completed'
+            canceled: 'Canceled'
+            resumed: 'Resumed'
 
     models:
       comable/order: 'Orders'
-      comable/order_details: 'Order details'
+      comable/order_items: 'Order items'
 
     attributes:
-      comable/customer:
+      comable/user:
         id: 'ID'
         email: 'Email address'
         password: 'Password'
@@ -198,28 +234,46 @@ en:
         bill_full_name: 'Full name of the billing address'
         orders: 'Orders'
         role: 'Role'
+        sign_in_count: 'Sign in count'
+        current_sign_in_at: 'Current sign in at'
+        last_sign_in_at: 'Last sign in at'
+        current_sign_in_ip: 'Current sign in ip'
+        last_sign_in_ip: 'Last sign in ip'
       comable/order:
+        id: 'ID'
         code: 'Order number'
         email: 'Email address'
         bill_address: 'Billing address'
         ship_address: 'Shipping address'
         payment_method: 'Payment method'
         shipment_method: 'Shipment method'
+        payment_fee: 'Payment fee'
         shipment_fee: 'Shipment fee'
         item_total_price: 'Item total'
         total_price: 'Total'
-        order_details: 'Order details'
-        completed_at: 'Comleted at'
+        order_items: 'Order items'
+        completed_at: 'Completed at'
         state: 'State'
         bill_address: 'Billing address'
         ship_address: 'Shipping adress'
         bill_full_name: 'Full name of the billing address'
-        order_details: 'Order details'
-      comable/order_detail: &comable_order_detail
+        order_items: 'Order items'
+        user_id: 'User ID'
+        guest_token: 'Guest token'
+        payment_state: 'Payment state'
+        shipment_state: 'Shipment state'
+      comable/order_item: &comable_order_item
         quantity: *quantity
         price: *price
         product: 'Product'
         subtotal_price: 'Subtotal'
+        name: 'Product name'
+        code: 'SKU code'
+        sku_h_choice_name: 'SKU Horizontal item name'
+        sku_v_choice_name: 'SKU Vertical item name'
+        sku_h_choice_name: 'SKU Horizontal choice name'
+        sku_v_choice_name: 'SKU Vertical choice name'
+        order: 'Order'
       comable/address: &comable_address
         full_name: 'Full name'
         family_name: 'Last name'
@@ -230,6 +284,7 @@ en:
         detail: 'Detail'
         phone_number: 'Phone number'
       comable/product:
+        id: 'ID'
         code: 'Code'
         name: 'Name'
         price: 'Price'
@@ -238,10 +293,13 @@ en:
         sku_h_item_name: 'SKU Horizontal item name'
         sku_v_item_name: 'SKU Vertical item name'
       comable/stock:
+        id: 'ID'
         code: 'SKU Code'
         quantity: 'Quantity'
         sku_h_choice_name: 'SKU Horizontal choice name'
         sku_v_choice_name: 'SKU Vertical choice name'
+        product: 'Product'
+        product_code: 'Product code'
       comable/store:
         name: 'Name'
         meta_keywords: 'Meta keywords'
@@ -256,20 +314,46 @@ en:
       comable/payment_method:
         name: 'Name'
         payment_provider: 'Oayment provider'
+        fee: 'Fee'
         enable_price: 'Enable price range'
-      comable/order/order_details:
-        <<: *comable_order_detail
+      comable/tracker:
+        activate_flag: 'Activated'
+        name: 'Name'
+        tracker_id: 'Tracker ID'
+        code: 'Code'
+        place: 'Place'
+      comable/order/order_items:
+        <<: *comable_order_item
       comable/order/bill_address:
         <<: *comable_address
       comable/order/ship_address:
         <<: *comable_address
+      comable/payment:
+        id: 'ID'
+        order_id: 'Order ID'
+        payment_method_id: 'Payment method ID'
+        fee: 'Fee'
+        state: 'Status'
+        completed_at: 'Completed at'
+      comable/shipment:
+        id: 'ID'
+        order_id: 'Order ID'
+        shipment_method_id: 'Shipment method ID'
+        fee: 'Fee'
+        state: 'Status'
+        tracking_number: 'Tracking number'
+        completed_at: 'Completed at'
 
   enumerize:
-    comable/customer:
+    comable/user:
       role:
         customer: 'Customer'
         reporter: 'Reporter'
         admin: 'Administrator'
+    comable/tracker:
+      place:
+        everywhere: 'Everywhere'
+        checkout: 'Checkout'
 
   views:
     pagination:
@@ -278,3 +362,10 @@ en:
       next: "Next &rsaquo;"
       previous: "&lsaquo; Previous"
       truncate: "&hellip;"
+
+  ransack:
+    predicates:
+      gteq: 'Greater than or equal to'
+      lteq: 'Less than or equal to'
+      eq_any_splitted: 'Exact match'
+      cont_any_splitted: 'Partial match'

data/config/locales/ja.yml

@@ -109,7 +109,7 @@ ja:
       note: 'NOTE:'
       results: 件
       times: 回
-      more: もっと見る
+      more: その他
       access_denied: アクセス権がありません
       order_count: 注文数
       new_orders: 新規受注
@@ -129,26 +129,41 @@ ja:
       add_sub_image: サブ画像を追加
       sign_in: ログイン
       sign_out: ログアウト
+      export_to_csv: 'CSV形式でエクスポート'
+      export_to_excel: 'Excel形式でエクスポート'
+      import: 'ファイルからインポート...'
+      unknown_file_type: '対応していないファイル形式です: %{filename}'
+      is_not_exists: 'が存在しません。'
+      ship: '発送'
+      help: 'ヘルプ'
+      tracker_code_help_introduction: |-
+        トラッキングコードには、特殊な記号を使うことでトラッキングIDや注文情報を埋め込むことができます。
+        たとえば <code>{{ order.total_price }}</code> のように書くと注文の合計金額を埋め込むことができます。
+        実際の画面ではこれが <code>1500</code> のように出力されます。
+      tracker_code_help_additional: '<code>order.order_items</code> は配列で、各要素から次の情報を取り出すことができます。'
+      list_of_usable_variables: '利用可能な変数は次の通りです。'
+      mote_infomation_for_syntax: '構文についての詳しい情報は次のページをご覧ください:'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
         product: 商品管理
         stock: 在庫管理
         category: カテゴリ
-        customer: ユーザー
+        user: ユーザー
         general_settings: 一般設定
         store: ストア設定
-        shipment_method: 配送管理
+        shipment_method: 発送管理
         payment_method: 決済管理
+        tracker: トラッキング情報
         products:
           detail: 商品詳細
         orders:
           detail: 注文明細
           cart: カート情報
-          customer: ユーザー詳細
+          user: ユーザー詳細
           shipment: 送料
           payment: 支払手数料
-        customers:
+        users:
           detail: ユーザー詳細
           edit: 編集
           new_orders: '最新の注文 (%{count}件)'
@@ -177,17 +192,38 @@ ja:
             cart: カート
             orderer: 請求先住所の選択
             delivery: 配送先住所の選択
-            shipment: 配送方法の選択
+            shipment: 発送方法の選択
             payment: 決済方法の選択
             confirm: 注文内容を確認
-            complete: 注文完了
+            completed: '注文完了'
+            canceled: 'キャンセル'
+            resumed: '再開'
+          events:
+            cancel: 'キャンセル'
+            resume: '再開'
+      comable/payment:
+        state:
+          states:
+            pending: '準備中'
+            ready: 'オーソリ完了'
+            completed: '決済完了'
+            canceled: 'キャンセル'
+            resumed: '再開'
+      comable/shipment:
+        state:
+          states:
+            pending: '準備中'
+            ready: '準備完了'
+            completed: '発送完了'
+            canceled: 'キャンセル'
+            resumed: '再開'
 
     models:
       comable/order: ご注文
-      comable/order_details: ご注文明細
+      comable/order_items: ご注文明細
 
     attributes:
-      comable/customer:
+      comable/user:
         id: ID
         email: メールアドレス
         password: パスワード
@@ -211,24 +247,33 @@ ja:
         ship_address: お届け先
         payment_method: お支払い方法
         shipment_method: 発送方法
+        payment_fee: '支払い手数料'
         shipment_fee: 送料
         item_total_price: 商品合計
         total_price: 合計
-        order_details: 商品
+        order_items: 商品
         completed_at: 注文日時
         state: ステータス
         bill_address: 請求先住所
         ship_address: 配送先住所
         bill_full_name: 配送先氏名
-        order_details: 注文明細
-        customer_id: ユーザーID
+        order_items: 注文明細
+        user_id: ユーザーID
         guest_token: ゲストトークン
-        shipment_tracking_number: 発送トラッキング番号
-      comable/order_detail: &comable_order_detail
+        payment_state: '決済ステータス'
+        shipment_state: '配送ステータス'
+      comable/order_item: &comable_order_item
         quantity: *quantity
         price: *price
         product: 商品情報
         subtotal_price: 小計
+        name: 商品名
+        code: SKU商品コード
+        sku_h_item_name: SKU横軸項目名
+        sku_v_item_name: SKU縦軸項目名
+        sku_h_choice_name: SKU横軸選択肢名
+        sku_v_choice_name: SKU縦軸選択肢名
+        order: 注文
       comable/address: &comable_address
         full_name: お名前
         family_name: 姓
@@ -253,6 +298,8 @@ ja:
         quantity: 在庫
         sku_h_choice_name: SKU横軸選択肢名
         sku_v_choice_name: SKU縦軸選択肢名
+        product: 商品
+        product_code: 商品コード
       comable/store:
         name: ストア名
         meta_keywords: メタキーワード
@@ -260,27 +307,53 @@ ja:
         email_sender: 送信元メールアドレス
         email_activate_flag: メール送信を有効にする
       comable/shipment_method:
-        name: 配送方法名
+        name: 発送方法名
         fee: 手数料
-        activate_flag: この配送方法を有効にする
+        activate_flag: この発送方法を有効にする
         traking_url: トラッキングURL
       comable/payment_method:
         name: 決済方法名
         payment_provider: 決済プロバイダ
+        fee: '手数料'
         enable_price: 利用可能な価格範囲
-      comable/order/order_details:
-        <<: *comable_order_detail
+      comable/tracker:
+        activate_flag: 'このトラッキング情報を有効にする'
+        name: 'トラッキング名'
+        tracker_id: 'トラッキングID'
+        code: 'トラッキングコード'
+        place: '設置場所'
+      comable/order/order_items:
+        <<: *comable_order_item
       comable/order/bill_address:
         <<: *comable_address
       comable/order/ship_address:
         <<: *comable_address
+      comable/payment:
+        id: 'ID'
+        order_id: '注文ID'
+        payment_method_id: '決済方法ID'
+        fee: '手数料'
+        state: 'ステータス'
+        completed_at: '決済日時'
+      comable/shipment:
+        id: 'ID'
+        order_id: '注文ID'
+        shipment_method_id: '発送方法ID'
+        fee: '手数料'
+        state: 'ステータス'
+        tracking_number: 'トラッキング番号'
+        completed_at: '発送日時'
 
   enumerize:
-    comable/customer:
+    comable/user:
       role:
         customer: 顧客
         reporter: 報告者
         admin: 管理者
+    comable/tracker:
+      place:
+        everywhere: 'すべて'
+        checkout: '注文完了画面'
 
   views:
     pagination:

data/db/migrate/{20140120032559_create_comable_customers.rb → 20140120032559_create_comable_users.rb}

@@ -1,6 +1,6 @@
-class CreateComableCustomers < ActiveRecord::Migration
+class CreateComableUsers < ActiveRecord::Migration
   def change
-    create_table :comable_customers do |t|
+    create_table :comable_users do |t|
       ## Database authenticatable
       t.string :email, null: false
       t.string :role, null: false
@@ -36,9 +36,9 @@ class CreateComableCustomers < ActiveRecord::Migration
       t.references :ship_address
     end
 
-    add_index :comable_customers, :email, unique: true
-    add_index :comable_customers, :reset_password_token, unique: true
-    # add_index :comable_customers, :confirmation_token, unique: true
-    # add_index :comable_customers, :unlock_token, unique: true
+    add_index :comable_users, :email, unique: true
+    add_index :comable_users, :reset_password_token, unique: true
+    # add_index :comable_users, :confirmation_token, unique: true
+    # add_index :comable_users, :unlock_token, unique: true
   end
 end

data/db/migrate/20140723175431_create_comable_orders.rb

@@ -1,14 +1,12 @@
 class CreateComableOrders < ActiveRecord::Migration
   def change
     create_table :comable_orders do |t|
-      t.references :customer
+      t.references :user
       t.string :guest_token
       t.string :code
       t.string :email
+      t.integer :payment_fee, null: false, default: 0
       t.integer :shipment_fee, null: false, default: 0
-      t.string :shipment_tracking_number
-      t.references :shipment_method
-      t.references :payment_method
       t.integer :total_price
       t.references :bill_address
       t.references :ship_address

data/db/migrate/{20140723175810_create_comable_order_details.rb → 20140723175810_create_comable_order_items.rb}

@@ -1,6 +1,6 @@
-class CreateComableOrderDetails < ActiveRecord::Migration
+class CreateComableOrderItems < ActiveRecord::Migration
   def change
-    create_table :comable_order_details do |t|
+    create_table :comable_order_items do |t|
       t.references :order, null: false
       t.references :stock, null: false
       t.string :name, null: false
@@ -13,6 +13,6 @@ class CreateComableOrderDetails < ActiveRecord::Migration
       t.integer :quantity, default: 1, null: false
     end
 
-    add_index :comable_order_details, [:order_id, :stock_id], unique: true, name: :comable_order_details_idx_01
+    add_index :comable_order_items, [:order_id, :stock_id], unique: true, name: :comable_order_items_idx_01
   end
 end

data/db/migrate/20140817194104_create_comable_payment_methods.rb

@@ -4,6 +4,7 @@ class CreateComablePaymentMethods < ActiveRecord::Migration
       t.string :name, null: false
       t.string :payment_provider_type, null: false
       t.integer :payment_provider_kind, null: false
+      t.integer :fee, null: false
       t.integer :enable_price_from
       t.integer :enable_price_to
     end

data/db/migrate/20141024025526_create_comable_addresses.rb

@@ -1,7 +1,7 @@
 class CreateComableAddresses < ActiveRecord::Migration
   def change
     create_table :comable_addresses do |t|
-      t.references :customer
+      t.references :user
       t.string :family_name, null: false
       t.string :first_name, null: false
       t.string :zip_code, null: false, limit: 8

data/db/migrate/20150423095210_create_comable_shipments.rb

@@ -0,0 +1,12 @@
+class CreateComableShipments < ActiveRecord::Migration
+  def change
+    create_table :comable_shipments do |t|
+      t.references :order, null: false
+      t.references :shipment_method, null: false
+      t.integer :fee, null: false
+      t.string :state, null: false
+      t.string :tracking_number
+      t.datetime :completed_at
+    end
+  end
+end

data/db/migrate/20150511171940_create_comable_payments.rb

@@ -0,0 +1,11 @@
+class CreateComablePayments < ActiveRecord::Migration
+  def change
+    create_table :comable_payments do |t|
+      t.references :order, null: false
+      t.references :payment_method, null: false
+      t.integer :fee, null: false
+      t.string :state, null: false
+      t.datetime :completed_at
+    end
+  end
+end

data/db/migrate/20150513185230_create_comable_trackers.rb

@@ -0,0 +1,12 @@
+class CreateComableTrackers < ActiveRecord::Migration
+  def change
+    create_table :comable_trackers do |t|
+      # TODO: Rename the column: activate_flag => activated
+      t.boolean :activate_flag, null: false, default: true
+      t.string :name, null: false
+      t.string :tracker_id
+      t.text :code, null: false
+      t.string :place, null: false
+    end
+  end
+end

data/db/seeds/comable/{customers.rb → users.rb}

@@ -34,17 +34,17 @@ def create_admin_user
   email = ask_admin_email
   password = ask_admin_password
 
-  if Comable::Customer.where(email: email).exists?
+  if Comable::User.where(email: email).exists?
     puts "WARNING: The email address has already existed: #{email}"
   else
-    Comable::Customer.with_role(:admin).new do |obj|
+    Comable::User.with_role(:admin).new do |obj|
       obj.email = email
       obj.password = password
     end.save!
   end
 end
 
-if Comable::Customer.with_role(:admin).exists?
+if Comable::User.with_role(:admin).exists?
   puts 'Admin user has already been previously created.'
 else
   create_admin_user

data/lib/comable/core/configuration.rb

@@ -3,7 +3,7 @@ module Comable
     module Configuration
       mattr_accessor :devise_strategies
       @@devise_strategies = {
-        customer: [:database_authenticatable, :registerable, :recoverable, :rememberable, :trackable]
+        user: [:database_authenticatable, :registerable, :recoverable, :rememberable, :trackable]
       }
 
       mattr_accessor :products_per_page
@@ -11,6 +11,12 @@ module Comable
 
       mattr_accessor :orders_per_page
       @@orders_per_page = 5
+
+      mattr_accessor :export_xlsx_header_style
+      @@export_xlsx_header_style = { bg_color: '00000000', fg_color: 'ffffffff', alignment: { horizontal: :center }, bold: true }
+
+      mattr_accessor :export_xlsx_style
+      @@export_xlsx_style = nil
     end
   end
 end

data/lib/comable/core/engine.rb

@@ -37,31 +37,6 @@ module Comable
         end
       end
 
-      initializer 'comable.devise.helpers' do
-        module DeviseHelperPrepender
-          def define_helpers(mapping)
-            super.tap do
-              return if mapping.name.to_sym != :customer
-              define_comable_helper
-            end
-          end
-
-          private
-
-          def define_comable_helper
-            class_eval <<-METHODS, __FILE__, __LINE__ + 1
-              alias_method :devise_current_customer, :current_customer
-              def current_customer
-                resource = current_admin_customer || devise_current_customer || Comable::Customer.new
-                resource.with_cookies(cookies)
-              end
-            METHODS
-          end
-        end
-
-        Devise::Controllers::Helpers.singleton_class.send(:prepend, DeviseHelperPrepender)
-      end
-
       initializer 'comable.devise.warden.manager' do
         Warden::Manager.after_set_user except: :fetch do |record, warden, options|
           if record.respond_to?(:after_set_user) && warden.authenticated?(options[:scope])

data/lib/comable/payment_provider/base.rb

@@ -14,6 +14,22 @@ module Comable
           please_implement_method
         end
 
+        def authorize!
+          true
+        end
+
+        def complete!
+          true
+        end
+
+        def cancel!
+          true
+        end
+
+        def resume!
+          true
+        end
+
         private
 
         def please_implement_method

data/lib/comable_core.rb

@@ -5,15 +5,20 @@ require 'ancestry'
 require 'acts_as_list'
 require 'carrierwave'
 require 'cancancan'
+require 'comma'
+require 'axlsx_rails'
+require 'roo'
+require 'liquid'
 
 require 'comable/core/configuration'
 require 'comable/core/engine'
 
-require 'comable/errors'
 require 'comable/payment_provider'
 require 'comable/state_machine_patch'
 require 'comable/deprecator'
 
+require 'comma_extractor_extentions'
+
 module Comable
   class << self
     def setup(&_)