Merge remote-tracking branch 'XTUPLE/4_5_x' into 23853
authorLinda Nichols <lynnaloo@gmail.com>
Sun, 22 Jun 2014 16:44:23 +0000 (16:44 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Sun, 22 Jun 2014 16:44:23 +0000 (16:44 +0000)
26 files changed:
enyo-client/database/orm/models/credit_card.json
enyo-client/database/source/en/strings.js
enyo-client/database/source/manifest.js
enyo-client/database/source/priv.sql [new file with mode: 0644]
enyo-client/database/source/xt/functions/add_priv.sql
foundation-database/manifest.js
foundation-database/public/functions/postcccashreceipt.sql
foundation-database/public/functions/postcccredit.sql
foundation-database/public/functions/setccbankaccnt.sql
foundation-database/public/functions/unreleasepurchaseorder.sql
foundation-database/public/patches/populate_ccpay_card_type.sql [new file with mode: 0644]
foundation-database/public/tables/ccbank.sql [new file with mode: 0644]
foundation-database/public/tables/ccpay.sql [new file with mode: 0644]
foundation-database/public/tables/payco.sql [new file with mode: 0644]
foundation-database/public/trigger_functions/ccpay.sql [new file with mode: 0644]
lib/enyo-x/source/views/grid_box.js
lib/enyo-x/source/views/workspace.js
node-datasource/routes/export.js
scripts/lib/build_database_util.js
scripts/xml/distribution_install.xml
scripts/xml/distribution_package.xml
scripts/xml/postbooks_package.xml
scripts/xml/xtmfg_install.xml
test/build/build_app.js
test/extensions/all/grid_box.js
test/extensions/sales/sales_order_workspace.js

index 1961c73..97ea88a 100644 (file)
     ],
     "isSystem": true
   },
+  {
+    "context": "xtuple",
+    "nameSpace": "XM",
+    "type": "SalesOrderPayment",
+    "table": "payco",
+    "idSequenceName": "payco_payco_id_seq",
+    "lockable": true,
+    "lockTable": "payco",
+    "isRest": true,
+    "comment": "Sales Order Payment Map",
+    "privileges": {
+      "all": {
+        "create": "ProcessCreditCards",
+        "read": "ProcessCreditCards",
+        "update": "ProcessCreditCards",
+        "delete": false
+      }
+    },
+    "properties": [
+      {
+        "name": "id",
+        "attr": {
+          "type": "Number",
+          "column": "payco_id",
+          "isPrimaryKey": true
+        }
+      },
+      {
+        "name": "uuid",
+        "attr": {
+          "type": "String",
+          "column": "obj_uuid",
+          "isNaturalKey": true
+        }
+      },
+      {
+        "name": "payment",
+        "toOne": {
+          "isNested": true,
+          "type": "CreditCardPayment",
+          "column": "payco_ccpay_id"
+        }
+      },
+      {
+        "name": "salesOrder",
+        "toOne": {
+          "type": "SalesOrderRelation",
+          "column": "payco_cohead_id"
+        }
+      },
+      {
+        "name": "amount",
+        "attr": {
+          "type": "Number",
+          "column": "payco_amount"
+        }
+      }
+    ],
+    "isSystem": true
+  },
+  {
+    "context": "xtuple",
+    "nameSpace": "XM",
+    "type": "CreditCardPayment",
+    "table": "ccpay",
+    "idSequenceName": "ccpay_ccpay_id_seq",
+    "lockable": true,
+    "lockTable": "ccpay",
+    "isRest": true,
+    "comment": "Credit Card Payment Map",
+    "privileges": {
+      "all": {
+        "create": "ProcessCreditCards",
+        "read": "ProcessCreditCards",
+        "update": "ProcessCreditCards",
+        "delete": false
+      }
+    },
+    "properties": [
+      {
+        "name": "id",
+        "attr": {
+          "type": "Number",
+          "column": "ccpay_id",
+          "isPrimaryKey": true
+        }
+      },
+      {
+        "name": "uuid",
+        "attr": {
+          "type": "String",
+          "column": "obj_uuid",
+          "isNaturalKey": true
+        }
+      },
+      {
+        "name": "creditCard",
+        "toOne": {
+          "type": "CreditCard",
+          "column": "ccpay_ccard_id"
+        }
+      },
+      {
+        "name": "customer",
+        "toOne": {
+          "type": "CustomerRelation",
+          "column": "ccpay_cust_id"
+        }
+      },
+      {
+        "name": "amount",
+        "attr": {
+          "type": "Number",
+          "column": "ccpay_amount"
+        }
+      },
+      {
+        "name": "wasPreauthorization",
+        "attr": {
+          "type": "Boolean",
+          "column": "ccpay_auth"
+        }
+      },
+      {
+        "name": "status",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_status"
+        }
+      },
+      {
+        "name": "type",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_type"
+        }
+      },
+      {
+        "name": "originalType",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_auth_charge"
+        }
+      },
+      {
+        "name": "orderNumber",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_order_number"
+        }
+      },
+      {
+        "name": "orderNumberSeq",
+        "attr": {
+          "type": "Number",
+          "column": "ccpay_order_number_seq"
+        }
+      },
+      {
+        "name": "gatewayTransId",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_ordernum"
+        }
+      },
+      {
+        "name": "gatewayAuthCode",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_code"
+        }
+      },
+      {
+        "name": "gatewayTransDate",
+        "attr": {
+          "type": "Date",
+          "column": "ccpay_yp_r_time"
+        }
+      },
+      {
+        "name": "gatewayAvsCode",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_avs"
+        }
+      },
+      {
+        "name": "gatewayTruncPan",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_card_pan_trunc"
+        }
+      },
+      {
+        "name": "gatewayCardType",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_card_type"
+        }
+      },
+      {
+        "name": "gatewayApproved",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_approved"
+        }
+      },
+      {
+        "name": "gatewayMessage",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_message"
+        }
+      },
+      {
+        "name": "gatewayError",
+        "attr": {
+          "type": "String",
+          "column": "ccpay_r_error"
+        }
+      }
+    ],
+    "isSystem": true
+  },
   {
     "context": "xtuple",
     "nameSpace": "SYS",
index 1b4c352..28bb745 100644 (file)
@@ -297,6 +297,7 @@ strict:true, trailing:true, white:true */
     "_xtdb_postCashReceipt6": "The selected Cash Receipt cannot be posted as the Bank Account cannot be determined. You must make a Bank Account Assignment for this Cash Receipt before you may post it.",
     "_xtdb_postCashReceipt7": "The selected Cash Receipt cannot be posted, probably because the Customer's Prepaid Account was not found.",
     "_xtdb_postCashReceipt8": "Cannot post this Cash Receipt because the credit card records could not be found.",
+    "_xtdb_postCCCashReceipt1": "Cannot post this Cash Receipt because annot find the default Bank Account for this Credit Card.",
     "_xtdb_postCCCashReceipt11": "Cannot post this Cash Receipt because the record of the credit card transaction either does not exist or is not consistent.",
     "_xtdb_postCCcredit1": "Cannot post this Credit Card refund because the default Bank Account for this Credit Card could not be found.",
     "_xtdb_postCCcredit2": "Cannot post this Credit Card refund because an invalid id/reference-type pair was passed.",
index 67e8c94..1f59a8b 100644 (file)
     "public/tables/comment_trigger.sql",
     "public/tables/pkghead.sql",
     "public/tables/schemaord.sql",
+    "priv.sql",
     "update_version.sql"
   ]
 }
diff --git a/enyo-client/database/source/priv.sql b/enyo-client/database/source/priv.sql
new file mode 100644 (file)
index 0000000..4c3e870
--- /dev/null
@@ -0,0 +1,7 @@
+-- Setup default 'ADMIN' role and grant it to 'admin' user it it doesn't exist.
+
+-- Add 'ADMIN' Role.
+select xt.add_role('ADMIN', 'Administrators Role');
+
+-- Grant 'admin' user 'ADMIN' Role.
+select xt.grant_user_role('admin', 'ADMIN');
index f1ef70b..76aeae2 100644 (file)
@@ -5,10 +5,14 @@ create or replace function xt.add_priv(name text, descrip text, module text, gro
   var sqlCount = "select count(*) as count from public.priv where priv_name = $1;",
     sqlId = "select nextval('public.priv_priv_id_seq') as sequence;",
     sqlInsert = "insert into public.priv (priv_id, priv_name, priv_module, priv_descrip) values ($1, $2, $3, $4)",
+    sqlGrantToAdmin = "select xt.grant_role_priv('ADMIN', $1, $2)",
     count = plv8.execute(sqlCount, [ name ])[0].count,
     nextId;
 
   if(count > 0) {
+    /* Grant this priv to the 'ADMIN' role by default. */
+    plv8.execute(sqlGrantToAdmin, [module, name]);
+
     return false;
   }
 
@@ -18,6 +22,10 @@ create or replace function xt.add_priv(name text, descrip text, module text, gro
   /* groop is used to segment the assignment box */
   /* module is the name of the extension. was used to filter the assignment box, but doesn't do that any more */
   plv8.execute(sqlInsert, [nextId, name, module, descrip]);
+
+  /* Grant this priv to the 'ADMIN' role by default. */
+  plv8.execute(sqlGrantToAdmin, [module, name]);
+
   return true;
 
 $$ language plv8;
index 4e27a2d..35330d2 100644 (file)
     "public/trigger_functions/cashrcptitem.sql",
     "public/trigger_functions/cashrcptmisc.sql",
     "public/trigger_functions/ccard.sql",
+    "public/trigger_functions/ccpay.sql",
     "public/trigger_functions/char.sql",
     "public/trigger_functions/charass.sql",
     "public/trigger_functions/charopt.sql",
 
     "public/tables/bankrecitem.sql",
     "public/tables/cashrcpt.sql",
+    "public/tables/ccpay.sql",
     "public/tables/metric.sql",
+    "public/tables/payco.sql",
     "public/tables/priv.sql",
     "public/tables/tax.sql",
     "public/tables/taxpay.sql",
     "public/tables/report/WarehouseMasterList.xml",
     "public/tables/report/items.xml",
 
-    "public/patches/fixacl.sql"
+    "public/patches/fixacl.sql",
+    "public/patches/populate_ccpay_card_type.sql"
   ]
 }
index 85debcf..bcd507b 100644 (file)
@@ -3,7 +3,7 @@ CREATE OR REPLACE FUNCTION postCCcashReceipt(pCCpay   INTEGER,
                                              pdoctype TEXT    DEFAULT NULL,
                                              pamount  NUMERIC DEFAULT NULL) RETURNS INTEGER AS
 $$
--- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple. 
+-- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
 -- See www.xtuple.com/CPAL for the full text of the software license.
 DECLARE
   _aropenid     INTEGER;
@@ -16,10 +16,9 @@ DECLARE
 
 BEGIN
   SELECT * INTO _c
-     FROM ccpay, ccard, custinfo
-     WHERE ( (ccpay_id = pCCpay)
-       AND   (ccpay_ccard_id = ccard_id)
-       AND   (ccpay_cust_id = cust_id) );
+     FROM ccpay
+     JOIN custinfo ON ccpay_cust_id = cust_id
+     WHERE (ccpay_id = pCCpay);
 
   IF (NOT FOUND) THEN
     RAISE EXCEPTION 'Cannot find the Credit Card transaction information [xtuple: postCCcashReceipt, -11, %]',
@@ -31,16 +30,17 @@ BEGIN
   END IF;
 
   SELECT bankaccnt_id, bankaccnt_accnt_id INTO _bankaccnt_id, _realaccnt
-  FROM ccbank JOIN bankaccnt ON (ccbank_bankaccnt_id=bankaccnt_id)
-  WHERE (ccbank_ccard_type=_c.ccard_type);
+  FROM ccbank
+  JOIN bankaccnt ON (ccbank_bankaccnt_id=bankaccnt_id)
+  WHERE (ccbank_ccard_type=_c.ccpay_card_type);
 
   IF (_bankaccnt_id IS NULL) THEN
     RAISE EXCEPTION 'Cannot find the default Bank Account for this Credit Card [xtuple: postCCcredit, -1, %]',
-                    _c.ccard_type;
+                    _c.ccpay_card_type;
   END IF;
 
-  _ccOrderDesc := (_c.ccard_type || '-' || _c.ccpay_order_number::TEXT ||
-                  '-' || _c.ccpay_order_number_seq::TEXT);
+  _ccOrderDesc := (_c.ccpay_card_type || '-' || _c.ccpay_order_number::TEXT ||
+                  '-' || _c.ccpay_order_number_seq::TEXT);
 
   _journal := fetchJournalNumber('C/R');
 
@@ -53,7 +53,7 @@ BEGIN
         cashrcpt_usecustdeposit
       ) VALUES (
         _c.ccpay_cust_id,   _c.ccpay_amount,     _c.ccpay_curr_id,
-        _c.ccard_type,      _c.ccpay_r_ordernum, _ccOrderDesc,
+        _c.ccpay_card_type,      _c.ccpay_r_ordernum, _ccOrderDesc,
         CURRENT_DATE,       _bankaccnt_id,
         fetchMetricBool('EnableCustomerDeposits'))
       RETURNING cashrcpt_id INTO _return;
@@ -62,7 +62,7 @@ BEGIN
       SET cashrcpt_cust_id=_c.ccpay_cust_id,
           cashrcpt_amount=_c.ccpay_amount,
           cashrcpt_curr_id=_c.ccpay_curr_id,
-          cashrcpt_fundstype=_c.ccard_type,
+          cashrcpt_fundstype=_c.ccpay_card_type,
           cashrcpt_docnumber=_c.ccpay_r_ordernum,
           cashrcpt_notes=_ccOrderDesc,
           cashrcpt_distdate=CURRENT_DATE,
@@ -98,14 +98,14 @@ BEGIN
     _return := _aropenid;
   END IF;
 
-  PERFORM insertGLTransaction(_journal, 'A/R', 'CR', _ccOrderDesc, 
+  PERFORM insertGLTransaction(_journal, 'A/R', 'CR', _ccOrderDesc,
                               ('Cash Receipt from Credit Card ' || _c.cust_name),
                               findPrepaidAccount(_c.ccpay_cust_id),
                               _realaccnt,
                               NULL,
-                             ROUND(currToBase(_c.ccpay_curr_id,
-                                              _c.ccpay_amount,
-                                              _c.ccpay_transaction_datetime::DATE),2),
+                              ROUND(currToBase(_c.ccpay_curr_id,
+                                               _c.ccpay_amount,
+                                               _c.ccpay_transaction_datetime::DATE),2),
                               CURRENT_DATE);
 
   RETURN _return;
index 3659dbb..166c4bd 100644 (file)
@@ -1,43 +1,41 @@
 CREATE OR REPLACE FUNCTION postCCcredit(INTEGER, TEXT, INTEGER) RETURNS INTEGER AS $$
--- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple. 
+-- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
 -- See www.xtuple.com/CPAL for the full text of the software license.
 DECLARE
-  pCCpay       ALIAS FOR $1;
+  pCCpay        ALIAS FOR $1;
   preftype      ALIAS FOR $2;
   prefid        ALIAS FOR $3;
-  _c           RECORD;
-  _ccOrderDesc TEXT;
+  _c            RECORD;
+  _ccOrderDesc  TEXT;
   _cglaccnt     INTEGER;
-  _dglaccnt    INTEGER;
+  _dglaccnt     INTEGER;
   _glseriesres  INTEGER;
-  _notes       TEXT := 'Credit via Credit Card';
-  _r           RECORD;
-  _sequence    INTEGER;
-  _dmaropenid  INTEGER;
+  _notes        TEXT := 'Credit via Credit Card';
+  _r            RECORD;
+  _sequence     INTEGER;
+  _dmaropenid   INTEGER;
 
 BEGIN
   IF ((preftype = 'cohead') AND NOT EXISTS(SELECT cohead_id
-                                            FROM cohead
-                                            WHERE (cohead_id=prefid))) THEN
+                                           FROM cohead
+                                           WHERE (cohead_id=prefid))) THEN
     RAISE EXCEPTION 'Cannot find original Sales Order for this Credit Card credit [xtuple: postCCcredit, -2, %, %, %]',
                     pCCpay, preftype, prefid;
   ELSIF ((preftype = 'aropen') AND NOT EXISTS(SELECT aropen_id
-                                                FROM aropen
-                                                WHERE (aropen_id=prefid))) THEN
+                                              FROM aropen
+                                              WHERE (aropen_id=prefid))) THEN
     RAISE EXCEPTION 'Cannot find original A/R Open record for this Credit Card credit [xtuple: postCCcredit, -2, %, %, %]',
                     pCCpay, preftype, prefid;
   ELSIF ((preftype = 'cmhead') AND NOT EXISTS(SELECT cmhead_id
-                                                FROM cmhead
-                                               WHERE cmhead_id=prefid)) THEN
+                                              FROM cmhead
+                                              WHERE cmhead_id=prefid)) THEN
     RAISE EXCEPTION 'Cannot find original Credit Memo record for this Credit Card credit [xtuple: postCCcredit, -2, %, %, %]',
                     pCCpay, preftype, prefid;
   END IF;
 
   SELECT * INTO _c
-     FROM ccpay
-     JOIN ccard  ON (ccpay_ccard_id = ccard_id)
-     JOIN ccbank ON (ccard_type=ccbank_ccard_type)
-    WHERE (ccpay_id = pCCpay);
+  FROM ccpay
+  WHERE (ccpay_id = pCCpay);
 
   IF (NOT FOUND) THEN
     RAISE EXCEPTION 'Cannot find the record for this Credit Card credit [xtuple: postCCcredit, -3, %, %, %]',
@@ -51,8 +49,9 @@ BEGIN
   END IF;
 
   SELECT bankaccnt_accnt_id INTO _cglaccnt
-  FROM bankaccnt
-  WHERE (bankaccnt_id=_c.ccbank_bankaccnt_id);
+  FROM ccbank
+  JOIN bankaccnt ON (ccbank_bankaccnt_id=bankaccnt_id)
+  WHERE (ccbank_ccard_type=_c.ccpay_card_type);
 
   IF (NOT FOUND) THEN
     RAISE EXCEPTION 'Cannot find the default Bank Account for this Credit Card [xtuple: postCCcredit, -1, %]',
@@ -67,10 +66,10 @@ BEGIN
   _sequence := fetchGLSequence();
 
   IF (_c.ccpay_r_ref IS NOT NULL) THEN
-    _ccOrderDesc := (_c.ccard_type || '-' || _c.ccpay_r_ref);
+    _ccOrderDesc := (_c.ccpay_card_type || '-' || _c.ccpay_r_ref);
   ELSE
-    _ccOrderDesc := (_c.ccard_type || '-' || _c.ccpay_order_number::TEXT ||
-                    '-' || COALESCE(_c.ccpay_order_number_seq::TEXT, ''));
+    _ccOrderDesc := (_c.ccpay_card_type || '-' || _c.ccpay_order_number::TEXT ||
+                    '-' || COALESCE(_c.ccpay_order_number_seq::TEXT, ''));
   END IF;
 
   _glseriesres := insertIntoGLSeries(_sequence, 'A/R', 'CC', _ccOrderDesc,
@@ -117,23 +116,23 @@ BEGIN
 
   IF (FOUND) THEN
     SELECT createardebitmemo(
-            NULL, 
+            NULL,
             _r.aropen_cust_id, NULL, fetchARMemoNumber(),
             _r.aropen_ordernumber, current_date, _c.ccpay_amount,
             _notes,
-            -1, -1, -1, CURRENT_DATE, -1, NULL, 0, 
+            -1, -1, -1, CURRENT_DATE, -1, NULL, 0,
             _r.aropen_curr_id) INTO _dmaropenid;
 
     IF (_r.aropen_open) THEN
       PERFORM applyARCreditMemoToBalance(_r.aropen_id, _dmaropenid);
       PERFORM postARCreditMemoApplication(_r.aropen_id);
     END IF;
-    
+
   END IF;
 
   IF (preftype = 'cohead') THEN
     INSERT INTO payco (
-      payco_ccpay_id, payco_cohead_id, payco_amount, payco_curr_id 
+      payco_ccpay_id, payco_cohead_id, payco_amount, payco_curr_id
     ) VALUES (
       pCCpay, prefid, 0 - _c.ccpay_amount, _c.ccpay_curr_id
     );
index 8e189ba..f1db045 100644 (file)
@@ -19,7 +19,7 @@ BEGIN
   IF (_numfound <= 0) THEN
     INSERT INTO ccbank (ccbank_ccard_type, ccbank_bankaccnt_id)
                 VALUES (pccardtype,        pbankaccntid)
-    RETURNING _ccbankid;
+    RETURNING ccbank_id INTO _ccbankid;
   END IF;
 
   RETURN _ccbankid;
index f5a585d..47a8db4 100644 (file)
@@ -4,12 +4,14 @@ CREATE OR REPLACE FUNCTION unreleasePurchaseOrder(pPoheadid INTEGER) RETURNS INT
 BEGIN
 
   IF ( ( SELECT (COUNT(*) > 0)
-         FROM poitem
+         FROM poitem LEFT OUTER JOIN recv ON (recv_order_type='PO' AND
+                                              recv_orderitem_id=poitem_id)
          WHERE ( (poitem_pohead_id=pPoheadid)
            AND   ( (poitem_status='C') OR
                    (poitem_qty_received > 0.0) OR
                    (poitem_qty_returned > 0.0) OR
-                   (poitem_qty_vouchered > 0.0) ) ) ) ) THEN
+                   (poitem_qty_vouchered > 0.0) OR
+                   (recv_id IS NOT NULL) ) ) ) ) THEN
     RETURN -1;
   END IF;
 
diff --git a/foundation-database/public/patches/populate_ccpay_card_type.sql b/foundation-database/public/patches/populate_ccpay_card_type.sql
new file mode 100644 (file)
index 0000000..6326bf9
--- /dev/null
@@ -0,0 +1,3 @@
+-- Issue #23459 adds ccpay_card_type. Populate it from historical ccard relations.
+UPDATE ccpay SET ccpay_card_type = (SELECT ccard_type FROM ccard WHERE ccard_id = ccpay_ccard_id)
+WHERE ccpay_ccard_id IS NOT NULL;
diff --git a/foundation-database/public/tables/ccbank.sql b/foundation-database/public/tables/ccbank.sql
new file mode 100644 (file)
index 0000000..d4d3915
--- /dev/null
@@ -0,0 +1,3 @@
+ALTER TABLE ccbank DROP CONSTRAINT IF EXISTS ccbank_ccbank_ccard_type_check;
+ALTER TABLE ccbank ADD  CONSTRAINT           ccbank_ccbank_ccard_type_check
+  CHECK (ccbank_ccard_type = ANY (ARRAY['A', 'D', 'M', 'P', 'V', 'O']));
diff --git a/foundation-database/public/tables/ccpay.sql b/foundation-database/public/tables/ccpay.sql
new file mode 100644 (file)
index 0000000..9336fa3
--- /dev/null
@@ -0,0 +1,5 @@
+-- Add columns for data needed for external pre-auths that will have no ccpay_ccard_id.
+select xt.add_column('ccpay','ccpay_card_pan_trunc', 'text', null, 'public', 'External Pre-Auth truncated PAN. Last four digits of the card.');
+-- TODO: PayPal
+--select xt.add_column('ccpay','ccpay_card_type', 'text', null, 'public', 'External Pre-Auth card type: V=Visa, M=MasterCard, A=American Express, D=Discover, P=Paypal.');
+select xt.add_column('ccpay','ccpay_card_type', 'text', null, 'public', 'External Pre-Auth card type: V=Visa, M=MasterCard, A=American Express, D=Discover.');
diff --git a/foundation-database/public/tables/payco.sql b/foundation-database/public/tables/payco.sql
new file mode 100644 (file)
index 0000000..c74de1f
--- /dev/null
@@ -0,0 +1,4 @@
+-- TODO: Add a precheck in the upgrade package.xml for this.
+select xt.add_constraint('payco','payco_unique_ccpay_id_cohead_id', 'unique(payco_ccpay_id, payco_cohead_id)', 'public');
+-- Add primary key.
+select xt.add_column('payco','payco_id', 'serial', 'primary key', 'public', 'payco table primary key.');
diff --git a/foundation-database/public/trigger_functions/ccpay.sql b/foundation-database/public/trigger_functions/ccpay.sql
new file mode 100644 (file)
index 0000000..72c1e7c
--- /dev/null
@@ -0,0 +1,27 @@
+CREATE OR REPLACE FUNCTION _ccpayBeforeTrigger () RETURNS TRIGGER AS $$
+-- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple.
+-- See www.xtuple.com/CPAL for the full text of the software license.
+DECLARE
+  _cardType TEXT;
+
+BEGIN
+  IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+    -- If ccpay_ccard_id is set, we don't care if ccpay_card_type is set,
+    -- we want to get the Card Type from ccard.
+    IF (NEW.ccpay_ccard_id IS NOT NULL) THEN
+      SELECT ccard_type INTO _cardType
+      FROM ccard
+      WHERE ccard_id = NEW.ccpay_ccard_id;
+
+      IF (_cardType IS NOT NULL) THEN
+        NEW.ccpay_card_type = _cardType;
+      END IF;
+    END IF;
+  END IF;
+
+  RETURN NEW;
+END;
+$$   LANGUAGE 'plpgsql';
+
+SELECT dropIfExists('TRIGGER', 'ccpayBeforeTrigger');
+CREATE TRIGGER ccpayBeforeTrigger BEFORE INSERT OR UPDATE ON ccpay FOR EACH ROW EXECUTE PROCEDURE _ccpayBeforeTrigger();
index 35b9ab9..127853a 100644 (file)
@@ -239,7 +239,8 @@ trailing:true, white:true, strict: false*/
     kind: "XV.Groupbox",
     classes: "panel xv-grid-box",
     events: {
-      onChildWorkspace: ""
+      onChildWorkspace: "",
+      onExportAttr:     ""
     },
     handlers: {
       ontap: "buttonTapped",
@@ -345,13 +346,14 @@ trailing:true, white:true, strict: false*/
         ]}
       );
 
-      // "New" button
       components.push({
         kind: "FittableColumns",
         name: "navigationButtonPanel",
         classes: "xv-buttons",
         components: [
-          {kind: "onyx.Button", name: "newButton", onclick: "newItem", classes: "icon-plus"}
+          {kind: "onyx.Button", name: "newButton", ontap: "newItem", classes: "icon-plus"},
+          {kind: "onyx.Button", name: "exportButton", ontap: "exportAttr",
+           icon: "share", content: "_export".loc(), classes: "icon-share"}
         ]
       });
 
@@ -527,6 +529,10 @@ trailing:true, white:true, strict: false*/
       editor.render();
       editor.setFirstFocus();
     },
+    exportAttr: function (inSender, inEvent) {
+      var gridbox = inEvent.originator.parent.parent;
+      this.doExportAttr({ attr: gridbox.attr });
+    },
     refreshLists: function () {
       this.$.aboveGridList.refresh();
       this.$.belowGridList.refresh();
index a913e9f..2eae521 100644 (file)
@@ -631,7 +631,7 @@ trailing:true, white:true, strict: false*/
     @extends enyo.Panels
     @extends XV.ListMenuManagerMixin
    */
-  enyo.kind(/** @lends XV.WorkspaceContainer# */{
+  enyo.kind(/** @lends XV.WorkspaceContainer# */_.extend({
     name: "XV.WorkspaceContainer",
     kind: "XV.ContainerPanels",
     classes: "xv-workspace-container",
@@ -656,7 +656,8 @@ trailing:true, white:true, strict: false*/
       onReport: "report",
       onStatusChange: "statusChanged",
       onTitleChange: "titleChanged",
-      onSaveTextChange: "saveTextChanged"
+      onSaveTextChange: "saveTextChanged",
+      onExportAttr:     "exportAttr"
     },
     components: [
       {kind: "FittableRows", name: "navigationPanel", classes: "xv-menu-container", components: [
@@ -1052,6 +1053,31 @@ trailing:true, white:true, strict: false*/
     saveTextChanged: function (inSender, inEvent) {
       this.$.saveButton.setContent(inEvent.content);
     },
+
+    exportAttr: function (inSender, inEvent) {
+      this.openExportTab('export', inEvent.attr);
+      return true;
+    },
+
+    // export just one attribute of the model displayed by the workspace
+    openExportTab: function (routeName, attr) {
+      var recordType = this.$.workspace.value.recordType,
+          id         = this.$.workspace.value.id,
+          idAttr     = this.$.workspace.value.idAttribute,
+          query = { parameters: [{ attribute: idAttr, value: id }],
+                    details: { attr: attr, id: id }
+      };
+      // sending the locale information back over the wire saves a call to the db
+      window.open(XT.getOrganizationPath() +
+        '/%@?details={"nameSpace":"%@","type":"%@","query":%@,"culture":%@,"print":%@}'
+        .f(routeName,
+          recordType.prefix(),
+          recordType.suffix(),
+          JSON.stringify(query),
+          JSON.stringify(XT.locale.culture),
+          "false"),
+        '_newtab');
+    },
     /**
      This is called for each row in the menu List.
      The menu text is derived from the corresponding panel index.
@@ -1237,6 +1263,6 @@ trailing:true, white:true, strict: false*/
     menuChanged: function () {
       this.$.menu.render();
     }
-  });
+  }, XV.ListMenuManagerMixin));
 
 }());
index d0edc6f..8f598ca 100644 (file)
@@ -150,19 +150,37 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
       } else {
         var resultAsCsv,
           filename = "export",
-          type;
+          type,
+          number = requestDetails.query &&
+                   requestDetails.query.details &&
+                   requestDetails.query.details.id,
+          attr = requestDetails.query &&
+                 requestDetails.query.details &&
+                 requestDetails.query.details.attr
+          ;
         try {
-          // try to name the file after the record type
           type = requestDetails.type;
-          // suffix() would be better than substring() but doesn't exist here yet
-          filename = type.replace("ListItem", "Export");
+          filename = type.replace("ListItem", "Export") +
+                     (attr && number ? "-" + number : "") +
+                     (attr           ? "-" + attr   : "")
+                   ;
 
         } catch (error) {
           // "export" will have to do.
         }
 
-        resultAsCsv = jsonToCsv(result.data.data);
-        res.attachment(filename + ".csv");
+        try {
+          /* export requests have 2 flavors: export a list of records (data.data)
+             or export a list of children of the current record ([0][attr]) */
+          if (attr) {
+            resultAsCsv = jsonToCsv(result.data.data[0][attr]);
+          } else {
+            resultAsCsv = jsonToCsv(result.data.data);
+          }
+          res.attachment(filename + ".csv");
+        } catch (error) {
+          resultAsCsv = jsonToCsv(error);
+        }
         res.send(resultAsCsv);
       }
     });
index e2f85ec..0cbb145 100644 (file)
@@ -314,14 +314,23 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
           // register extension and dependencies
           extensionSql = 'do $$ plv8.elog(NOTICE, "About to register extension ' +
             extensionName + '"); $$ language plv8;\n' + extensionSql;
+
           registerSql = "select xt.register_extension('%@', '%@', '%@', '', %@);\n"
             .f(extensionName, extensionComment, options.extensionLocation, loadOrder);
 
+          var grantExtToAdmin = "select xt.grant_role_ext('ADMIN', '%@');\n"
+            .f(extensionName);
+
+          extensionSql = grantExtToAdmin + extensionSql;
+
           dependencies = manifest.dependencies || [];
           _.each(dependencies, function (dependency) {
             var dependencySql = "select xt.register_extension_dependency('%@', '%@');\n"
-              .f(extensionName, dependency);
-            extensionSql = dependencySql + extensionSql;
+                .f(extensionName, dependency),
+              grantDependToAdmin = "select xt.grant_role_ext('ADMIN', '%@');\n"
+                .f(dependency);
+
+            extensionSql = dependencySql + grantDependToAdmin + extensionSql;
           });
           extensionSql = registerSql + extensionSql;
         }
index 3b48d7b..1e14b58 100644 (file)
@@ -7,7 +7,7 @@
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
     <query>SELECT fetchMetricText('Application') = 'PostBooks';</query>
-    <message>This package must be applied to a Distribution database.</message>
+    <message>This package must be applied to a PostBooks database.</message>
   </prerequisite>
 
   <prerequisite type = "query"
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
-               name = "Checking for bad xTuple ERP database version" >
-<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
 <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
     <message>This package may not be applied to a 4.5+ PostBooks database.
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
 <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
     <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>
 
+  <prerequisite type = "query"
+               name = "Checking for duplicate Credit Card payments on Sales Orders" >
+    <query>
+      WITH counter AS (SELECT COUNT(*) AS freq
+                        FROM payco
+                        GROUP BY payco_ccpay_id, payco_cohead_id
+                        ORDER BY 1)
+      SELECT (COALESCE(MAX(freq), 1) = 0 OR COALESCE(MAX(freq), 1) = 1)
+      FROM counter;
+    </query>
+    <message>There are duplicate payco_ccpay_id and payco_cohead_id on the payco table. Please see your system administrator or contact xTuple.
+    </message>
+  </prerequisite>
+
   <script file="postbooks_upgrade.sql" />
   <script file="inventory_basic_install.sql" />
   <script file="inventory_upgrade.sql" />
index f798144..48d0027 100644 (file)
     </message>
   </prerequisite>
 
+ <prerequisite type = "query"
+               name = "Checking for xwd schema" >
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xwd');</query>
+    <message>This package requires that XWD 240 package to be installed before continuing.</message>
+  </prerequisite>
+
   <script file="postbooks_upgrade.sql" />
   <script file="inventory_upgrade.sql" />
   <script file="distribution_upgrade.sql" />
index 54e958f..b3b8d93 100644 (file)
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
-               name = "Checking for bad xTuple ERP database version" >
-<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
 <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
     <message>This package may not be applied to a 4.5+ Postbooks database.
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
 <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
     <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>
 
+  <prerequisite type = "query"
+               name = "Checking for duplicate Credit Card payments on Sales Orders" >
+    <query>
+      WITH counter AS (SELECT COUNT(*) AS freq
+                        FROM payco
+                        GROUP BY payco_ccpay_id, payco_cohead_id
+                        ORDER BY 1)
+      SELECT COALESCE(MAX(freq), 1) <= 1
+      FROM counter;
+    </query>
+    <message>There are duplicate payco_ccpay_id and payco_cohead_id on the payco table. Please see your system administrator or contact xTuple.
+    </message>
+  </prerequisite>
+
   <script file="postbooks_upgrade.sql" />
 
 </package>
index 68b4dc2..4f7e97b 100644 (file)
@@ -7,7 +7,7 @@
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
     <query>SELECT fetchMetricText('Application') = 'PostBooks';</query>
-    <message>This package must be applied to a Distribution Edition database.</message>
+    <message>This package must be applied to a PostBooks Edition database.</message>
   </prerequisite>
 
   <prerequisite type = "query"
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
-               name = "Checking for bad xTuple ERP database version" >
-<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
 <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
     <message>This package may not be applied to a 4.5.0+ PostBooks database.
     </message>
   </prerequisite>
 
- <prerequisite type = "query"
 <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
     <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>
 
+  <prerequisite type = "query"
+               name = "Checking for duplicate Credit Card payments on Sales Orders" >
+    <query>
+      WITH counter AS (SELECT COUNT(*) AS freq
+                        FROM payco
+                        GROUP BY payco_ccpay_id, payco_cohead_id
+                        ORDER BY 1)
+      SELECT (COALESCE(MAX(freq), 1) = 0 OR COALESCE(MAX(freq), 1) = 1)
+      FROM counter;
+    </query>
+    <message>There are duplicate payco_ccpay_id and payco_cohead_id on the payco table. Please see your system administrator or contact xTuple.
+    </message>
+  </prerequisite>
+
   <script file="postbooks_upgrade.sql" />
   <script file="inventory_basic_install.sql" />
   <script file="inventory_upgrade.sql" />
index d6722a5..f9ba4ed 100644 (file)
@@ -41,35 +41,6 @@ var buildAll = require('../../scripts/lib/build_all'),
       });
     });
 
-    it('should grant all privileges to the user', function (done) {
-      var sql = "insert into usrpriv (usrpriv_username, usrpriv_priv_id) " +
-        "select $1, priv_id " +
-        "from priv " +
-        "left join usrpriv on priv_id = usrpriv_priv_id and usrpriv_username = $1 " +
-        "where usrpriv_id is null";
-
-      creds.database = databaseName;
-      creds.parameters = [loginData.username];
-      datasource.query(sql, creds, function (err, res) {
-        assert.isNull(err);
-        done();
-      });
-    });
-
-    it('should grant all extensions to the user', function (done) {
-      var sql = "insert into xt.usrext (usrext_usr_username, usrext_ext_id) " +
-        "select $1, ext_id " +
-        "from xt.ext " +
-        "left join xt.usrext on ext_id = usrext_ext_id and usrext_usr_username = $1 " +
-        "where usrext_id is null";
-
-      creds.database = databaseName;
-      creds.parameters = [loginData.username];
-      datasource.query(sql, creds, function (err, res) {
-        assert.isNull(err);
-        done();
-      });
-    });
   });
 }());
 
index 00288a4..09e017d 100644 (file)
@@ -31,8 +31,8 @@
         _.each(XV, function (value, key) {
           var list,
             kinds = ['SalesOrderList', 'QuoteList', 'InvoiceList', 'ReturnList', 'ProjectList'];
-          // loop through lists with grid boxes
-          if (XV.inheritsFrom(value.prototype, "XV.List") && _.contains(kinds, key)) {
+          // lists with grid boxes; TODO: find candidates automatically
+          if (_.contains(kinds, key)) {
 
             describe('Create Workspace for XV.' + key, function () {
               it('Create a Workspace', function () {
@@ -40,7 +40,7 @@
                 smoke.navigateToNewWorkspace(XT.app, list, function (workspaceContainer) {
                   var workspace = workspaceContainer.$.workspace;
                   _.each(workspace.$, function (component) {
-                    if (XV.inheritsFrom(component, 'XV.GridBox') && XV.inheritsFrom(component, 'XV.WorkflowGridBox')) {
+                    if (XV.inheritsFrom(component, 'XV.GridBox')) {
 
                       describe('Test creating line items for ' + component, function () {
                         it('Create line items', function () {
                           // verify again that a row has been added
                           assert.equal(gridBox.liveModels().length, startingRows += 1);
                         });
+
+                        it('Check export', function () {
+                          var getExportButton = function (obj) {
+                            var result = null;
+                            if (_.isObject(obj.$)) {
+                              result = obj.$.exportButton ||
+                                       _.find(obj.$, getExportButton);
+                            }
+                            return result;
+                          };
+
+                          var gridBox = component,
+                              exportButton = getExportButton(gridBox);
+                          assert.ok(exportButton);
+                          // TODO: need to populate before we can export
+                          // assert.doesNotThrow(exportButton.doTap());
+                          // TODO: find the generated file & check contents
+                        });
                       });
                     }
                   });
index 5366e94..8dbc6a8 100644 (file)
           assert.equal(gridBox.liveModels().length, 1);
         });
       });
+      it('Supply list should have action to open Item Workbench', function (done) {
+        if (!XT.extensions.inventory) {
+          done();
+          return;
+        }
+        var verify,
+          action = _.find(gridBox.$.supplyList.actions, function (action) {
+            return action.name === "openItemWorkbench";
+          }),
+          prereq = action.prerequisite;
+        gridBox.$.supplyButton.bubble("ontap");
+        gridBox.$.supplyList.select(0);
+
+        gridBox.$.supplyList.value.models[0][prereq](function (hasPriv) {
+          assert.isTrue(hasPriv);
+          if (hasPriv) {
+            gridBox.$.supplyList.actionSelected(null, {action: {method: "openItemWorkbench"}, index: 0});
+
+            setTimeout(function () {
+              assert.equal(XT.app.$.postbooks.getActive().$.workspace.kind, "XV.ItemWorkbenchWorkspace");
+              XT.app.$.postbooks.getActive().doPrevious();
+              assert.equal(XT.app.$.postbooks.getActive().$.workspace.kind, "XV.SalesOrderWorkspace");
+              done();
+            }, 3000);
+          } else {done(); }
+        });
+      });
       it('adding a second line item should not copy the item', function (done) {
         workspace.value.once("change:total", done());