shopqi-app-webhook 0.1.3 → 0.1.4

data/lib/generators/shopqi_app_webhook/shopqi_app_webhook_generator.rb

@@ -16,6 +16,8 @@ class ShopQiAppWebhookGenerator < Rails::Generators::Base
   def update_files
     prepend_to_file "app/models/shop.rb", "require \"\#{ShopQiAppWebhook::Engine.models_dir}/shop\"\n"
     insert_into_file "app/models/shop.rb", "\s\shas_many :orders\n", after: /class Shop( < ActiveRecord::Base){0,1}\n/
+    insert_into_file "config/app_secret_config.yml", "\s\s\s\shost: 'lvh.me:3000'\n", after: /defaults:(.|\n|\s)+?domain:\n/
+    insert_into_file "config/app_secret_config.yml", "\s\s\s\shost: 'example.shopqiapp.com'\n", after: /production:(.|\n|\s)+?domain:\n/
   end
 
   def install_migration

data/lib/generators/shopqi_app_webhook/templates/app/controllers/home_controller.rb

@@ -0,0 +1,11 @@
+class HomeController < ApplicationController
+  skip_before_filter :authenticate_shop!, only: :index
+
+  def index
+    if signed_in?
+      @orders = current_shop.orders
+    else
+      redirect_to login_path
+    end
+  end
+end

data/lib/generators/shopqi_app_webhook/templates/app/controllers/webhook_controller.rb

@@ -2,7 +2,16 @@ class WebhookController < ShopQiAppWebhook::WebhookController
 
   def orders_fulfilled
     attrs = JSON(request.body.read)['order']
-    shop.orders.where(order_id: order_id).first_or_create! name: attrs['name'], order_id: attrs['id'], total_price: attrs['total_price'], created_at: attrs['created_at']
+    shop.orders.where(order_id: order_id).first_or_create!({
+      name: attrs['name'],
+      financial_status_name: attrs['financial_status_name'],
+      financial_status: attrs['financial_status'],
+      fulfillment_status: attrs['fulfillment_status'],
+      fulfillment_status_name: attrs['fulfillment_status_name'],
+      order_id: attrs['id'],
+      total_price: attrs['total_price'],
+      created_at: attrs['created_at']
+    })
     render nothing: true
   end
 

data/lib/generators/shopqi_app_webhook/templates/app/models/order.rb

@@ -1,4 +1,8 @@
 class Order < ActiveRecord::Base
   belongs_to :shop
-  attr_accessible :name, :order_id, :total_price, :created_at
+  attr_accessible :name, :financial_status, :financial_status_name, :fulfillment_status, :fulfillment_status_name, :order_id, :total_price, :created_at
+
+  def admin_url
+    "#{SecretSetting.shopqi_domain.protocol}#{shop.shopqi_domain}/admin/orders/#{order_id}"
+  end
 end

data/lib/generators/shopqi_app_webhook/templates/app/views/home/index.html.haml

@@ -0,0 +1,18 @@
+.content
+  %h2 最近订单
+  %table.table.table-striped
+    %thead
+      %tr
+        %th 订单号
+        %th 支付状态
+        %th 发货状态
+        %th 总金额
+    %tbody
+      -@orders.each do |order|
+        %tr
+          %td=link_to order.name, order.admin_url, target: :_blank
+          %td
+            %span.label{class: financial_class(order.financial_status)}=order.financial_status_name
+          %td
+            %span.label{class: fulfillment_class(order.fulfillment_status)}=order.fulfillment_status_name
+          %td=order.total_price

data/lib/generators/shopqi_app_webhook/templates/db/migrate/create_orders.rb

@@ -1,12 +1,16 @@
 class CreateOrders < ActiveRecord::Migration
   def change
     create_table :orders do |t|
-      t.references :shop    , null: false
-      t.integer :order_id   , unique: true, null: false
-      t.string :name        , limit: 32   , null: false
-      t.float :total_price  , null: false
-      t.datetime :created_at, null: false
+      t.references :shop               , null: false
+      t.integer :order_id              , null: false, unique: true
+      t.string :name                   , null: false, limit: 32
+      t.string :financial_status       , null: false, limit: 16
+      t.string :financial_status_name  , null: false, limit: 32
+      t.string :fulfillment_status     , null: false, limit: 16
+      t.string :fulfillment_status_name, null: false, limit: 32
+      t.float :total_price             , null: false
+      t.datetime :created_at           , null: false
     end
-    add_index :orders, :shop_id, unique: true
+    add_index :orders, :order_id, unique: true
   end
 end

data/lib/shopqi_app_webhook/version.rb

@@ -1,3 +1,3 @@
 module ShopQiAppWebhook
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app-webhook
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,11 +152,12 @@ files:
 - app/models/shop.rb
 - app/assets/javascripts/shopqi_app_webhook/application.js
 - app/assets/stylesheets/shopqi_app_webhook/application.css
-- app/views/layouts/shopqi_app_webhook/application.html.erb
 - lib/generators/shopqi_app_webhook/templates/db/migrate/create_orders.rb
 - lib/generators/shopqi_app_webhook/templates/app/jobs/webhook_worker.rb
 - lib/generators/shopqi_app_webhook/templates/app/controllers/webhook_controller.rb
+- lib/generators/shopqi_app_webhook/templates/app/controllers/home_controller.rb
 - lib/generators/shopqi_app_webhook/templates/app/models/order.rb
+- lib/generators/shopqi_app_webhook/templates/app/views/home/index.html.haml
 - lib/generators/shopqi_app_webhook/templates/README
 - lib/generators/shopqi_app_webhook/shopqi_app_webhook_generator.rb
 - lib/generators/shopqi_app_webhook/USAGE
@@ -182,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -15699565
+      hash: 272106625
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -15699565
+      hash: 272106625
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/views/layouts/shopqi_app_webhook/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>ShopQiAppWebhook</title>
-  <%= stylesheet_link_tag    "shopqi_app_webhook/application", :media => "all" %>
-  <%= javascript_include_tag "shopqi_app_webhook/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>