受注管理の販売元IDに対応

diff --git a/db/migrate/20100401032906_add_retailer_id_to_order.rb b/db/migrate/20100401032906_add_retailer_id_to_order.rb
new file mode 100644 (file)
index 0000000..ca3bf10
--- /dev/null
+++ b/db/migrate/20100401032906_add_retailer_id_to_order.rb
@@ -0,0 +1,10 @@
+class AddRetailerIdToOrder < ActiveRecord::Migration
+  def self.up
+    add_column :orders, :retailer_id, :integer, :default => 1, :comment => "販売元ID"
+    execute("UPDATE orders SET retailer_id = 1")
+  end
+
+  def self.down
+    remove_columns :orders, :retailer_id
+  end
+end

diff --git a/spec/csv/order_status_update_other_shop.csv b/spec/csv/order_status_update_other_shop.csv
new file mode 100644 (file)
index 0000000..149b01e
--- /dev/null
+++ b/spec/csv/order_status_update_other_shop.csv
@@ -0,0 +1,8 @@
+\92\8d\95¶ID,\8eó\92\8d\94Ô\8d\86,\90©,\96¼,\90©(\83Z\83C),\96¼(\83\81\83C),\97X\95Ö\94Ô\8d\86(\91O\94¼),\97X\95Ö\94Ô\8d\86(\8cã\94¼),\93s\93¹\95{\8c§,\8fZ\8f\8a(\8es\8bæ\92¬\91º),\8fZ\8f\8a(\8fÚ\8d×),\93d\98b\94Ô\8d\8601,\93d\98b\94Ô\8d\8602,\93d\98b\94Ô\8d\8603,FAX\94Ô\8d\8601,FAX\94Ô\8d\8602,FAX\94Ô\8d\8603,\83\81\81[\83\8b\83A\83h\83\8c\83X,\90E\8bÆ,\90«\95Ê,\92a\90¶\93ú,\8f¬\8cv,\91\97\97¿,\8eè\90\94\97¿,\8eg\97p\83|\83C\83\93\83g,,\8d\87\8cv,\8ex\95¥\95û\96@,\8ex\95¥\8d\87\8cv,\83\81\83b\83Z\81[\83W,\94z\91\97\90æ \90©,\94z\91\97\90æ \96¼,\94z\91\97\90æ \90©(\83J\83i),\94z\91\97\90æ \96¼(\83J\83i),\94z\91\97\90æ\93s\93¹\95{\8c§,\94­\91\97\90æ\97X\95Ö\94Ô\8d\86(\91O\94¼),\94z\91\97\90æ\97X\95Ö\94Ô\8d\86(\8cã\94¼),\94z\91\97\90æ\8fZ\8f\8a(\8es\8bæ\92¬\91º),\94z\91\97\90æ\8fZ\8f\8a(\8fÚ\8d×),\94z\91\97\90æ\93d\98b\94Ô\8d\8601,\94z\91\97\90æ\93d\98b\94Ô\8d\8602,\94z\91\97\90æ\93d\98b\94Ô\8d\8603,\94z\91\97\90æFAX\94Ô\8d\8601,\94z\91\97\90æFAX\94Ô\8d\8602,\94z\91\97\90æFAX\94Ô\8d\8603,\94z\91\97\8bÆ\8eÒ,\94­\91\97\8e\9e\8aÔ,\94­\91\97\93ú,\94z\92B\8a®\97¹,\83X\83e\81[\83^\83X,\94­\91\97\8dÏ\82Ý\83X\83e\81[\83^\83X\82É\95Ï\8dX\82µ\82½\93ú,\93o\98^\93ú,\8dX\90V\93ú,SHOP\83\81\83\82,\94­\91\97\93`\95[\94Ô\8d\86
+3530,2010111312103240,\97£\93\87,\94g\8fÆ\8aÔ,\83\8a\83g\83E,\83n\83e\83\8b\83},907,1751,\89«\93ê\8c§,\94ª\8fd\8eR\8cS\92|\95x\92¬\94g\8fÆ\8aÔ,1-2-3,098,1111,2222,,,,test@kbmj.com,,\8f\97\90«,1980-01-01,10000,0,10,0,0,10010,,10010,,\97£\93\87,\94g\8fÆ\8aÔ,\83\8a\83g\83E,\83n\83e\83\8b\83},\96k\8aC\93¹,907,1751,\94ª\8fd\8eR\8cS\92|\95x\92¬\94g\8fÆ\8aÔ,1-2-3,098,1111,1111,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3529,2010111114593239,\93c\92\86,\88ê\98Y,\83^\83i\83J,\83C\83`\83\8d\83E,000,0000,\93\8c\8b\9e\93s,\83e\83X\83g\8es\83e\83X\83g\92¬,1-2-3,03,1111,2222,,,,test@kbmj.com,,\8f\97\90«,1980-01-01,20000,0,10,0,0,20010,,20010,,\93c\92\86,\93ñ\98Y,\83^\83i\83J,\83W\83\8d\83E,\96k\8aC\93¹,331,0812,\90ç\91ã\93c\8bæ\90_\93c\90_\95Û\92¬,1-2-3,010,1111,1111,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3528,2010111114373238,\93c\92\86,\88ê\98Y,\83^\83i\83J,\83C\83`\83\8d\83E,000,0000,\93\8c\8b\9e\93s,\83e\83X\83g\8es\83e\83X\83g\92¬,1-2-3,03,1111,2222,,,,test@kbmj.com,\8cö\96±\88õ,\8f\97\90«,1980-01-01,20000,0,10,0,0,20010,,20010,,\93c\92\86,\88ê\98Y,\83^\83i\83J,\83C\83`\83\8d\83E,\93\8c\8b\9e\93s,000,0000,\83e\83X\83g\8es\83e\83X\83g\92¬,1-2-3,03,1111,2222,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3527,2010111114133237,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,331,0812,\8dé\8bÊ\8c§,\82³\82¢\82½\82Ü\8es,\96k\8bæ,048,1111,2222,,,,test33@kbmj.com,,\92j\90«,1980-01-01,10000,0,10,0,0,10010,,10010,,\82 \82 ,\82¢\82¢,\83A\83A,\83C\83C,\93\8c\8b\9e\93s,000,0000,\83e\83X\83g\8es\83e\83X\83g\92¬,1-3-5\81\9b\81\9b\81\9b\83r\83\8b,03,0000,0000,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3526,2010111114003236,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,331,0812,\8dé\8bÊ\8c§,\82³\82¢\82½\82Ü\8es,\96k\8bæ,048,1111,2222,,,,test33@kbmj.com,,\92j\90«,1980-01-01,20000,0,10,150,0,20010,,19860,,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,\8dé\8bÊ\8c§,331,0812,\82³\82¢\82½\82Ü\8es,\96k\8bæ,048,1111,2222,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3525,2010111113443235,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,000,0000,\93\8c\8b\9e\93s,\8fa\92J\8bæ,\8cb\94ä\8eõ,010,1111,2222,,,,test@kbmj.com,,\92j\90«,1980-01-01,20000,0,10,0,0,20010,,20010,,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,\93\8c\8b\9e\93s,000,0000,\8fa\92J\8bæ,\8cb\94ä\8eõ,010,1111,2222,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,
+3523,2010111018343233,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,000,0000,\93\8c\8b\9e\93s,\8fa\92J\8bæ,\8cb\94ä\8eõ,010,1111,2222,,,,test@kbmj.com,,\92j\90«,1980-01-01,10000,0,10,0,0,10010,,10010,,\82Ä\82·\82Æ,\82Ä\82·\82Æ,\83e\83X\83g,\83e\83X\83g,\93\8c\8b\9e\93s,000,0000,\8fa\92J\8bæ,\8cb\94ä\8eõ,010,1111,2222,,,,,\8ew\92è\82È\82µ,,,\8eó\92\8d,,\89Î 11 24 09:46:38 UTC 2009,\89Î 11 24 09:46:38 UTC 2009,,