Improves upgrade script.

[platal.git] / upgrade / 1.0.1 / 13_payments.sql

diff --git a/upgrade/1.0.1/13_payments.sql b/upgrade/1.0.1/13_payments.sql
index 0430f96..6252fbd 100644 (file)
--- a/upgrade/1.0.1/13_payments.sql
+++ b/upgrade/1.0.1/13_payments.sql
@@ -1,10 +1,11 @@
+DROP TABLE IF EXISTS payment_bankaccounts;
 CREATE TABLE payment_bankaccounts (
   id integer PRIMARY KEY auto_increment,
   asso_id integer NOT NULL,
   account varchar(23) NOT NULL,
   owner varchar(100) NOT NULL,
   status set('new','used','old') NOT NULL default 'new'
-);
+) ENGINE=InnoDB, CHARSET=utf8;
 
 #INSERT INTO payment_bankaccounts VALUES (NULL,,"30002004690000008524R29","Amis de l'Espace Dirigea","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,239,"10207001172019602580784","ASCCX","used");
@@ -14,8 +15,8 @@ INSERT INTO payment_bankaccounts VALUES (NULL,42,"30002004200000009372U74","AX (
 INSERT INTO payment_bankaccounts VALUES (NULL,31,"10107001820002105034095","Binet Point Gamma","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,73,"30003020600003729601589","GTX","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,246,"20041000012241609M02035","Humanix - Jacques Bellev","used");
-#INSERT INTO payment_bankaccounts VALUES (NULL,,"10107001820092105033751","Kes des élèves","used");
-INSERT INTO payment_bankaccounts VALUES (NULL,214,"30003022160005198020072","Khomiss (Aurélien Lajoie","used");
+#INSERT INTO payment_bankaccounts VALUES (NULL,,"10107001820092105033751","Kes des élèves","used");
+INSERT INTO payment_bankaccounts VALUES (NULL,214,"30003022160005198020072","Khomiss (Aurélien Lajoie","used");
 #INSERT INTO payment_bankaccounts VALUES (NULL,,"30003021900002011521283","Maison des X","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,181,"10107001820012105055968","Raid Polytechnique 2004","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,165,"20041010123576371A03369","Sabix","used");
@@ -40,17 +41,19 @@ INSERT INTO payment_bankaccounts VALUES (NULL,248,"12548029983443030151039","X-R
 INSERT INTO payment_bankaccounts VALUES (NULL,179,"30066106410001050600128","X-Sursaut H Levy-Lambert","used");
 INSERT INTO payment_bankaccounts VALUES (NULL,223,"30066100410001126780124","X-Theatre","used");
 
+DROP TABLE IF EXISTS payment_reconcilations;
 CREATE TABLE payment_reconcilations (
   id INTEGER PRIMARY KEY auto_increment,
   method_id INTEGER NOT NULL,
   period_start DATE NOT NULL,
   period_end DATE NOT NULL,
+  recongroup_id INTEGER DEFAULT NULL,
   status ENUM('pending','transfering','closed') NOT NULL DEFAULT 'pending',
   payment_count INTEGER NOT NULL,
   sum_amounts DECIMAL(9,2) NOT NULL, # transaction amount, before taking the commission
   sum_commissions DECIMAL(9,2) NOT NULL,
   comments text NOT NULL
-);
+) ENGINE=InnoDB, CHARSET=utf8;
 
 ALTER TABLE payment_transactions ADD method_id INTEGER DEFAULT NULL AFTER id; # NULL if not initiated from the site
 ALTER TABLE payment_transactions CHANGE timestamp ts_confirmed DATETIME DEFAULT NULL; # NULL = not confirmed
@@ -67,23 +70,26 @@ UPDATE payment_transactions SET status = 'confirmed';
 UPDATE payment_transactions SET amount=CONVERT(REPLACE(REPLACE(amount_tmp," EUR",""),",","."),DECIMAL(9,2));
 ALTER TABLE payment_transactions ADD KEY method_id (method_id);
 ALTER TABLE payment_transactions ADD KEY ref (ref);
-ALTER TABLE payment_transactions ADD UNIQUE KEY fullref (fullref);
-#fullref dupliqués :
+# ALTER TABLE payment_transactions ADD UNIQUE KEY fullref (fullref);
+#fullref dupliqués :
 #select t1.* from payment_transactions as t1 join payment_transactions as t2 using(fullref) group by(t1.id) having count(*)!=1 order by fullref;
 ALTER TABLE payment_transactions DROP amount_tmp;
 
+DROP TABLE IF EXISTS payment_transfers;
 CREATE TABLE payment_transfers (
-  id integer PRIMARY KEY auto_increment,
-  payment_id integer NOT NULL,
+  id INTEGER PRIMARY KEY auto_increment,
+  recongroup_id INTEGER NOT NULL,
+  payment_id INTEGER NOT NULL,
   amount DECIMAL(9,2) NOT NULL,
+  account_id INTEGER DEFAULT NULL,
   message VARCHAR(255) NOT NULL,
-  date DATE # NULL = not done
-);
+  date DATE DEFAULT NULL # NULL = not done
+) ENGINE=InnoDB, CHARSET=utf8;
 
-CREATE TABLE payment_recon_transfer (
-  recon_id INTEGER NOT NULL,
-  transfer_id INTEGER NOT NULL,
-  PRIMARY KEY (recon_id,transfer_id)
-);
+ALTER TABLE payment_methods ADD short_name VARCHAR(10) NOT NULL;
+ALTER TABLE payment_methods ADD flags SET('deferred_com') DEFAULT '';
+UPDATE payment_methods SET short_name='paypal', flags='' WHERE id=1;
+UPDATE payment_methods SET short_name='bplc2', flags='deferred_com' WHERE id=2;
 
 -- vim:set syntax=mysql:
+