Changeset 701 for trunk

Timestamp:

01/01/10 14:34:39 (2 years ago)

Author:

nate

Message:

• Removed references to 'deposits' and replaced them with references to 'credits' (in relation to ar items and receipts).
• Made sure that the type field for aritems should be able to take 'credit' but not 'deposit', and the update will change the references from deposit to credit (this time on the database side).
• Fixed bugs with generateuuids.php and with the load open items button on the receipts add-edit.

Location:

trunk/phpbms

Files:

• install/generateuuids.php (modified) (1 diff)
• modules/bms/aritems_view.php (modified) (3 diffs)
• modules/bms/include/aritems.php (modified) (4 diffs)
• modules/bms/include/receipts.php (modified) (7 diffs)
• modules/bms/install/updatev0.9.sql (modified) (1 diff)
• modules/bms/install/updatev0.98.sql (modified) (1 diff)
• modules/bms/javascript/aritem.js (modified) (2 diffs)
• modules/bms/javascript/receipt.js (modified) (9 diffs)
• modules/bms/receipts_addedit.php (modified) (2 diffs)
• modules/bms/receipts_aritem_ajax.php (modified) (6 diffs)
• modules/bms/report/receipts_pdf.php (modified) (1 diff)

trunk/phpbms/install/generateuuids.php

@@ -209 +209 @@
             $this->updateFields("invoicestatushistory", array("invoiceid"=>$this->invoiceList, "invoicestatusid"=>$this->invoiceStatsList, "assignedtoid"=>$this->userList));
             $this->updateFields("addresstorecord", array("tabledefid"=>$this->tabledefList, "recordid"=>$this->clientList, "addressid"=>$this->addressList));
-            $this->updateFields("receiptitems", array("receiptid"=>$this->recieptList, "aritemid"=>$this->aritemList));
-            $this->updateFields("receipts", array("clientid"=>$this->clientList, "payementmethodid"=>$this->paymentList));
+            $this->updateFields("receiptitems", array("receiptid"=>$this->receiptList, "aritemid"=>$this->aritemList));
+            $this->updateFields("receipts", array("clientid"=>$this->clientList, "paymentmethodid"=>$this->paymentList));
             $this->updateFields("aritems", array("clientid"=>$this->clientList));
             $this->updateFields("prerequisites", array("parentid"=>$this->productList, "childid"=>$this->productList));

trunk/phpbms/modules/bms/aritems_view.php

@@ -42 +42 @@
         include("modules/bms/include/aritems.php");
 
-        $aritems = new phpbmstable($db,"tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c");
+        $aritems = new aritems($db,"tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c");
         $therecord = $aritems->processAddEditPage();
 
@@ -86 +86 @@
                 $theform->addField($theinput);
 
-                $theinput = new inputField("relatedid",$therecord["relatedid"],"related record id",true,NULL,14,64);
+                $theinput = new inputField("relatedid",$therecord["relatedid"],"related record id",true,NULL,42,64);
                 $theinput->setAttribute("class","uneditable");
                 $theinput->setAttribute("readonly","readonly");
@@ -137 +137 @@
                         <p><?php $theform->showField("type"); ?></p>
 
-                        <p><?php $theform->showField("relatedid"); ?> <button type="button" title="view related record" class="graphicButtons buttonInfo" id="viewRelatedButton"><span>View Record</span></button></p>
+                        <p>
+            <input type="hidden" id="editrelatedid" name="editrelatedid" value="<?php echo($therecord["editrelatedid"]); ?>" />
+            <?php $theform->showField("relatedid"); ?>
+            <button type="button" title="view related record" class="graphicButtons buttonInfo" id="viewRelatedButton">
+                <span>View Record</span>
+            </button>
+            </p>
 
                 </fieldset>

trunk/phpbms/modules/bms/include/aritems.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
+
+if(class_exists("phpbmsTable")){
+        class aritems extends phpbmsTable{
+                
+                function getRecord($id, $useUuid = false){
+                        
+                        $therecord = parent::getRecord($id, $useUuid);
+                        
+                        /**
+                          *   If type is credit, get the receipt id
+                          *   else get the invoice id
+                          */
+                        if($therecord["type"] == "credit")
+                                $therecord["editrelatedid"] = getId($this->db, "tbld:43678406-be25-909b-c715-7e2afc7db601", $therecord["relatedid"]);
+                        else
+                                $therecord["editrelatedid"] = getId($this->db, "tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883", $therecord["relatedid"]);
+                                
+                        return $therecord;
+                        
+                }//end function --getRecord--
+                
+        }//end class
+}//end if
+
 class relatedClient{
 
@@ -119 +143 @@
                 ";
 
-                        if($this->aritem["type"] == "deposit")
+                        if($this->aritem["type"] == "credit")
                                 $querystatement.="
                                         AND receipts.uuid != '".mysql_real_escape_string($this->aritem["relatedid"])."'";
@@ -147 +171 @@
                 $this->totals = $this->db->fetchArray($totalresult);
 
-                if($this->aritem["type"] == "deposit")
+                if($this->aritem["type"] == "credit")
                         $this->totals["applied"] = $this->totals["applied"] + $this->aritem["amount"];
 
@@ -203 +227 @@
                                                                 $therecord["name"] = "other";
 
-                                                        if($therecord["id"] == $this->aritem["relatedid"] && $this->aritem["type"] == "deposit")
+                                                        if($therecord["id"] == $this->aritem["relatedid"] && $this->aritem["type"] == "credit")
                                                                 $therecord["applied"] = -1 * $therecord["applied"];
 

trunk/phpbms/modules/bms/include/receipts.php

@@ -55 +55 @@
                                         `receiptitems`.`discount`,
                                         `receiptitems`.`taxadjustment`,
-                                        IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`,
+                                        `aritems`.`type`,
                                         `aritems`.`relatedid`,
                                         `aritems`.`itemdate`,
@@ -98 +98 @@
                                         $dueDate = " ";
 
-                                if($therecord["type"] == "deposit" && $therecord["relatedid"] == $receiptid){
+                                if($therecord["type"] == "credit" && $therecord["relatedid"] == $receiptid){
                                         $therecord["relatedid"] = "";
                                         $therecord["amount"] = 0;
@@ -149 +149 @@
                         $this->db->query($deletestatement);
 
-                        //remove any ar deposits created by ths receipt
+                        //remove any ar credits created by ths receipt
                         $deletestatement = "DELETE FROM aritems WHERE relatedid = '".mysql_real_escape_string($receiptid)."' AND `type` = 'credit'";
                         $this->db->query($deletestatement);
@@ -155 +155 @@
                         foreach($itemlist as $itemRecord){
 
-                                //if no ar uuid, or the deposit is from this record, we need to create the ar item
-                                if(!$itemRecord["aritemid"] || ($itemRecord["relatedid"] == $receiptid && $itemRecord["type"] == "deposit") ){
+                                //if no ar uuid, or the credit is from this record, we need to create the ar item
+                                if(!$itemRecord["aritemid"] || ($itemRecord["relatedid"] == $receiptid && $itemRecord["type"] == "credit") ){
 
                                         $arrecord = array();
@@ -638 +638 @@
                                         aritems
                                 WHERE
-                                        `type` = 'deposit'
+                                        `type` = 'credit'
                                         AND (".str_replace("uuid", "relatedid", $newWhere).")";
 
@@ -827 +827 @@
                                                 aritems.status,
                                                 aritems.relatedid,
-                                                IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`
+                                                `aritems`.`type`
                                         FROM
                                                 `receiptitems` INNER JOIN `aritems` ON `receiptitems`.`aritemid` = `aritems`.`uuid`
@@ -838 +838 @@
                                 while($itemrecord = $this->db->fetchArray($itemsresult)){
 
-                                        if($itemrecord["relatedid"] == $therecord["uuid"] && $itemrecord["type"] == "deposit")
+                                        if($itemrecord["relatedid"] == $therecord["uuid"] && $itemrecord["type"] == "credit")
                                                 $paid = $itemrecord["paid"];
                                         else

trunk/phpbms/modules/bms/install/updatev0.9.sql

@@ -124 +124 @@
 UPDATE `invoicestatuses` SET `name`="Shipped", `setreadytopost`=1 WHERE id = 4;
 UPDATE `invoices` SET `readytopost`=1 WHERE `type`="Invoice";
-CREATE TABLE `aritems` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `clientid` int(10) unsigned NOT NULL, `type` ENUM('invoice','deposit','service charge') NOT NULL, `status` ENUM('open','closed') NOT NULL, `itemdate` DATE NOT NULL, `relatedid` int(10) unsigned default NULL, `amount` double NOT NULL default '0', `paid` double NOT NULL default '0', `aged1` tinyint(3) unsigned NOT NULL default '0', `aged2` tinyint(3) unsigned NOT NULL default '0', `aged3` tinyint(3) unsigned NOT NULL default '0', `title` varchar(255) default NULL, `posted` tinyint(3) unsigned NOT NULL default '0', `createdby` int(10) unsigned NOT NULL, `creationdate` datetime NOT NULL, `modifiedby` int(10) unsigned default NULL, `modifieddate` timestamp NOT NULL, PRIMARY KEY  (`id`));
+CREATE TABLE `aritems` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `clientid` int(10) unsigned NOT NULL, `type` ENUM('invoice','credit','service charge') NOT NULL, `status` ENUM('open','closed') NOT NULL, `itemdate` DATE NOT NULL, `relatedid` int(10) unsigned default NULL, `amount` double NOT NULL default '0', `paid` double NOT NULL default '0', `aged1` tinyint(3) unsigned NOT NULL default '0', `aged2` tinyint(3) unsigned NOT NULL default '0', `aged3` tinyint(3) unsigned NOT NULL default '0', `title` varchar(255) default NULL, `posted` tinyint(3) unsigned NOT NULL default '0', `createdby` int(10) unsigned NOT NULL, `creationdate` datetime NOT NULL, `modifiedby` int(10) unsigned default NULL, `modifieddate` timestamp NOT NULL, PRIMARY KEY  (`id`));
 CREATE TABLE `receipts` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `clientid` int(10) unsigned NOT NULL, `amount` double NOT NULL default '0', `receiptdate` date NOT NULL, `status` enum('open','collected') NOT NULL default 'open', `readytopost` tinyint(3) unsigned NOT NULL default '0', `posted` tinyint(3) unsigned NOT NULL default '0', `paymentmethodid` int(10) unsigned NOT NULL default '0', `ccnumber` varchar(64) default NULL, `ccexpiration` varchar(10) default NULL, `ccverification` varchar(4) default NULL, `bankname` varchar(64) default NULL, `checkno` varchar(32) default NULL, `routingnumber` int(10) unsigned default NULL,`accountnumber` int(10) unsigned default NULL, `transactionid` varchar(64) default NULL, `paymentother` varchar(128) default NULL, `memo` text, `createdby` int(11) NOT NULL default '0', `creationdate` datetime NOT NULL default '0000-00-00 00:00:00', `modifiedby` int(10) unsigned default NULL, `modifieddate` timestamp NOT NULL, PRIMARY KEY  (`id`));
 INSERT INTO `settings` (`name`,`value`) VALUES ('term1_days','30');

trunk/phpbms/modules/bms/install/updatev0.98.sql

@@ -39 +39 @@
     ADD COLUMN `uuid` VARCHAR(64) NOT NULL,
     MODIFY `clientid` VARCHAR(64) NOT NULL,
-    MODIFY `relatedid` VARCHAR(64);
+    MODIFY `relatedid` VARCHAR(64),
+    MODIFY `type` ENUM('invoice','credit','service charge', 'deposit') NOT NULL;
+UPDATE `aritems` SET `type`='credit' WHERE `type`='deposit';
+ALTER TABLE `aritems`
+    MODIFY `type` ENUM('invoice','credit','service charge') NOT NULL;
 --end aritems ALTER--
 --attachements ALTER--

trunk/phpbms/modules/bms/javascript/aritem.js

@@ -41 +41 @@
                 
                 var type = getObjectFromID("type");
-                var relatedid = getObjectFromID("relatedid")
+                var relatedid = getObjectFromID("editrelatedid")
                 var id = getObjectFromID("id");
                 
@@ -49 +49 @@
                 var theURL = "";
                 
-                if(type.value == "deposit")
+                if(type.value == "credit")
                         theURL += receiptEdit.value;
                 else

trunk/phpbms/modules/bms/javascript/receipt.js

@@ -591 +591 @@
                 var theID, docDue, amountToApply, refid, theType;
 
-                //first find all non-zero deposits and add it to the total;
+                //first find all non-zero credits and add it to the total;
                 for(var i=0; i< appliedFields.length; i++){
 
@@ -597 +597 @@
                         theType = getObjectFromID(theID+"Type");
 
-                        if(theType.value == "deposit"){
+                        if(theType.value == "credit"){
 
                                 docDue = currencyToNumber(getObjectFromID(theID + "DocDue").value) + currencyToNumber(appliedFields[i].value);
@@ -706 +706 @@
                         ];
 
-                var depositSelect = getObjectFromID("newItemDepositARID");
-                console.log(depositSelect);
-                if(!depositSelect){
-
-                        var depositP = getObjectFromID("newItemDepositExistingP");
-                        var depositExistingCheckbox = getObjectFromID("newItemDepositExisting");
-                        depositExistingCheckbox.disabled = true;
-                        depositP.className = "disabledtext";
+                var creditSelect = getObjectFromID("newItemCreditARID");
+                
+                if(!creditSelect){
+
+                        var creditP = getObjectFromID("newItemCreditExistingP");
+                        var creditExistingCheckbox = getObjectFromID("newItemCreditExisting");
+                        creditExistingCheckbox.disabled = true;
+                        creditP.className = "disabledtext";
 
                 }//endif
@@ -728 +728 @@
 
                 var type = getObjectFromID("newItemType");
-                var newItemDepositExisting = getObjectFromID("newItemDepositExisting");
+                var newItemCreditExisting = getObjectFromID("newItemCreditExisting");
 
                 var theSelect = null;
 
                 switch(type.value){
-                        case "deposit":
-                                if(newItemDepositExisting.checked)
-                                        theSelect = getObjectFromID("newItemDepositARID");
+                        case "credit":
+                                if(newItemCreditExisting.checked)
+                                        theSelect = getObjectFromID("newItemCreditARID");
                                 break;
 
@@ -795 +795 @@
                                 invoiceid:null,
                                 uuid:null,
-                                type: 'deposit',
+                                type: 'credit',
                                 relatedid: null,
                                 itemdate: dateToString(new Date(), 'SQL'),
@@ -813 +813 @@
                 checkbox = e.src();
 
-                var newItemDepositFieldset = getObjectFromID("newItemDepositFieldset");
+                var newItemCreditFieldset = getObjectFromID("newItemCreditFieldset");
                 var newItemInvoiceFieldset = getObjectFromID("newItemInvoiceFieldset");
                 var newItemServiceChargeFieldset = getObjectFromID("newItemServiceChargeFieldset");
@@ -821 +821 @@
 
                         case "invoice":
-                                newItemDepositFieldset.style.display = "none";
+                                newItemCreditFieldset.style.display = "none";
                                 newItemServiceChargeFieldset.style.display = "none";
                                 newItemInvoiceFieldset.style.display = "block";
@@ -834 +834 @@
 
                         case "service charge":
-                                newItemDepositFieldset.style.display = "none";
+                                newItemCreditFieldset.style.display = "none";
                                 newItemServiceChargeFieldset.style.display = "block";
                                 newItemInvoiceFieldset.style.display = "none";
@@ -849 +849 @@
                                 break;
 
-                        case "deposit":
-                                newItemDepositFieldset.style.display = "block";
+                        case "credit":
+                                newItemCreditFieldset.style.display = "block";
                                 newItemServiceChargeFieldset.style.display = "none";
                                 newItemInvoiceFieldset.style.display = "none";

trunk/phpbms/modules/bms/receipts_addedit.php

@@ -40 +40 @@
         include("modules/bms/include/receipts.php");
 
+        if(!isset($_GET["backurl"]))
+                $backurl = NULL;
+        else{
+                $backurl = $_GET["backurl"];
+                if(isset($_GET["refid"]))
+                        $backurl .= "?refid=".$_GET["refid"];
+        }
+        
         if(!isset($_GET["id"]))
                 $_GET["id"] = 0;
@@ -47 +55 @@
                 $_SERVER['HTTP_REFERER'] = $_POST["referrer"];
 
-        $thetable = new receipts($db,"tbld:43678406-be25-909b-c715-7e2afc7db601");
+        $thetable = new receipts($db,"tbld:43678406-be25-909b-c715-7e2afc7db601", $backurl);
         $therecord = $thetable->processAddEditPage();
 

trunk/phpbms/modules/bms/receipts_aritem_ajax.php

@@ -21 +21 @@
                                         `aritems`.`relatedid`,
                                         `aritems`.`itemdate`,
-                                        IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`,
+                                        `aritems`.`type`,
                                         `aritems`.`amount`,
                                         `aritems`.`paid`
@@ -48 +48 @@
                                         `aritems`.`relatedid`,
                                         `aritems`.`itemdate`,
-                                        IF(`aritems`.`type` = 'credit', 'deposit', `aritems`.`type`) AS `type`,
+                                        `aritems`.`type`,
                                         `aritems`.`amount`,
                                         `aritems`.`paid`
@@ -114 +114 @@
 
                         $queryType = $type;
-                        if($type == "deposit")
+                        if($type == "credit")
                                 $queryType = "credit";
 
@@ -139 +139 @@
                         ";
 
-                                if($type == "deposit")
+                                if($type == "credit")
                                         $querystatement .= "itemdate";
                                 else
@@ -189 +189 @@
                                 <p>
                                         <select id="newItemType">
-                                                <option value="deposit">deposit</option>
+                                                <option value="credit">credit</option>
                                                 <option value="invoice">invoice</option>
                                                 <option value="service charge">service charge</option>
@@ -197 +197 @@
                         </fieldset>
 
-                        <fieldset id="newItemDepositFieldset">
-                                <legend>Deposits</legend>
-
-                                <p id="newItemDepositNewP">
-                                        <input type="radio" class="radiochecks" name="newItemDepositType" id="newItemDepositNew" checked="checked"/>
-                                        <label for="newItemDepositNew">new</label>
-                                </p>
-
-                                <p id="newItemDepositExistingP">
-                                        <input type="radio" class="radiochecks" name="newItemDepositType" id="newItemDepositExisting"/>
-                                        <label for="newItemDepositExisting">existing deposit</label>
+                        <fieldset id="newItemCreditFieldset">
+                                <legend>Credits</legend>
+
+                                <p id="newItemCreditNewP">
+                                        <input type="radio" class="radiochecks" name="newItemCreditType" id="newItemCreditNew" checked="checked"/>
+                                        <label for="newItemCreditNew">new</label>
+                                </p>
+
+                                <p id="newItemCreditExistingP">
+                                        <input type="radio" class="radiochecks" name="newItemCreditType" id="newItemCreditExisting"/>
+                                        <label for="newItemCreditExisting">existing credit</label>
                                 </p>
 
                                 <p id="newItemExisingListP">
-                                        <?php $this->_showOpenARSelect($clientid, "deposit"); ?>
+                                        <?php $this->_showOpenARSelect($clientid, "credit"); ?>
                                 </p>
                         </fieldset>

trunk/phpbms/modules/bms/report/receipts_pdf.php

@@ -490 +490 @@
                                 $line["duedate"] = "";
 
-                        if($line["type"] == "deposit" && $line["relatedid"] == $this->receiptrecord["id"]){
+                        if($line["type"] == "credit" && $line["relatedid"] == $this->receiptrecord["id"]){
                                 $line["relatedid"] = "";
                                 $line["amount"] = 0;