Changeset 384 for trunk/phpbms/common

Timestamp:

05/04/08 17:18:08 (4 years ago)

Author:

brieb

Message:

Pre v0.96 check in:

• Added support for multiple addresses
• Added link to google maps for addresses on client and sales order screens.
• Added obfuscation ability to sensitive payment information when voiding/deleting or posting receipts and sales orders.
• Replaced autofill fields with new smartsearch technologies
• Fixed recurring invoice bug
• Switched several sales order AJAX calls to use JSON
• Reorganized quickView screens

Left to do:

• Finish BMS update/install scripts with address and addressto record tabledef/table support information
• Re-code delete prospect code
• Finish BMS update/install scripts with new client/client dup tabledef/table support information.

Location:

trunk/phpbms/common

Files:

• javascript/common.js (modified) (9 diffs)
• javascript/datepicker.js (modified) (1 diff)
• javascript/smartsearch.js (added)
• stylesheet/mozilla/base.css (modified) (1 diff)
• stylesheet/mozilla/forms.css (modified) (1 diff)
• stylesheet/mozilla/image/button-map.png (added)
• stylesheet/mozilla/image/button-www.png (modified) (previous)
• stylesheet/mozilla/pages/base (added)
• stylesheet/mozilla/pages/base/smartsearches.css (added)
• stylesheet/mozilla/pages/bms (added)
• stylesheet/mozilla/pages/bms/addresses.css (added)
• stylesheet/mozilla/pages/bms/clientaddresses.css (added)
• stylesheet/mozilla/pages/client.css (modified) (2 diffs)
• stylesheet/mozilla/pages/invoice.css (modified) (5 diffs)
• stylesheet/mozilla/pages/quickview.css (modified) (3 diffs)

trunk/phpbms/common/javascript/common.js

@@ -108 +108 @@
             }
         }
-    }//endfunction      
-        
+    },//endfunction
+        
+        
+        htmlDecode: function(string){
+
+                        var ret, tarea = document.createElement('textarea');
+                        tarea.innerHTML = string;
+                        ret = tarea.value;
+                        return ret;
+
+        },//end function
+
+
+        reportError: function(error){
+                
+                if(console){
+                        if(console.log)
+                                console.log(error);
+                } else
+                        alert(error);
+                
+        }//end method - reportError
+
+
 });//end update
 
@@ -115 +137 @@
         "update",
         "nameFunctions",
-        "loadXMLDoc"
+        "loadXMLDoc",
+        "htmlDecode",
+        "reportError"
 ];
 
@@ -171 +195 @@
                 return retVal;
         }//endMethod    
-
+        
 })//end update
 
@@ -297 +321 @@
         _listener: function(srcObj, func){
         var E = phpBMS.signal.e;
+                
+                if(!srcObj || !func){
+                        
+                        reportError("ListnerError srcObj:" + srcObj + " func:" + func);
+                        return false;
+                        
+                }//endif
+                        
                 return function (nativeEvent) {
                         return func.apply(srcObj, [new E(srcObj, nativeEvent)]);
@@ -304 +336 @@
 
         connect: function(srcObj, eventName, func){
+                
+                if(!srcObj || !eventName || !func){
+                        
+                        var err = "Invalid Entry for connect: srcObj:" + srcObj + " eventName:" + eventName + " func:" + func
+                        reportError(err);                       
+                        
+                        return false;
+                        
+                }//endif 
+                
         var self = phpBMS.signal;
                 
@@ -316 +358 @@
         var ident = [srcObj, eventName, listener];
         self._observers.push(ident);
-               
         return ident;
                 
@@ -339 +380 @@
         var self = phpBMS.signal;
         var observers = self._observers;
-
-                self._disconnect(ident);
-                observers.splice(ident, 1);
-                
-                return true;
-        }
+                
+        for (var i = 0; i < observers.length; i++) {
+            var pident = observers[i];
+                        if(pident == ident){
+
+
+                                self._disconnect(ident);
+                                observers.splice(i, 1)
+                                return true;
+                        }
+                }
+                return false;
+        },
+
+        trigger: function(src, sig){
+                
+        var self = phpBMS.signal;
+        var observers = self._observers;
+
+        var E = phpBMS.signal.e;
+        for (var i = 0; i < observers.length; i++) {
+            var ident = observers[i];
+            if (ident[0] === src && ident[1] === sig) {
+                try {
+                    ident[2].apply([new E(src, sig)]);
+                } catch (err) {
+                                        reportError(err)
+                }
+            }//endif
+        }//endfor
+                
+        }//end method - signal
         
 })//end class
@@ -351 +418 @@
         "connect",
         "disconnect",
-        "getIdent"
+        "getIdent",
+        "trigger"
 ]
 
@@ -856 +924 @@
         showModal(text,"Alert",250);
 }
+
+/* Function Overloads and Extensions --------------------- */
+/* ------------------------------------------------------- */
+String.prototype.trim = function() {
+        a = this.replace(/^\s+/, '');
+        return a.replace(/\s+$/, '');
+};
+
 window.alert = function(txt) {modalAlert(txt);}
 

trunk/phpbms/common/javascript/datepicker.js

@@ -101 +101 @@
         var thedate=new Date(parseInt(year,10),parseInt(month,10)-1,parseInt(day,10));
         thefield.value=dateToString(thedate);
+
         if(thefield.onchange) thefield.onchange.call(thefield);
+        trigger(thefield,"onchange");
+        
         closeDPBox();
 }

trunk/phpbms/common/stylesheet/mozilla/base.css

@@ -86 +86 @@
         #saveButton1,#saveButton2{width:68px;margin-right:3px;}
         #cancelButton1,#cancelButton2{width:68px;}
+        
+/* ============================================================================== */
+/* Smart Searches                                                                 */
+/* ============================================================================== */
+.inputSmartSearch{
+        background-image:url("image/magnify.gif");
+        background-position:right;
+        background-repeat:no-repeat;
+        padding-right:10px;
+}
+
+.smartSearchBox{
+        border:1px solid #999999;
+        background:white;
+        position:absolute;
+}
+
+.SBResults{
+ overflow:auto;
+}
+
+.SBResults DIV{
+         color:#666666;
+         padding:5px;
+         font-style:italic;
+}
+
+.SBResults A{
+/*      width:245px;/* 295 - 5 - 30 */
+        display:block;
+        color:#663366;
+        font-weight:normal;
+        padding:6px 5px 6px 5px;
+        background-repeat:no-repeat;
+        background-position:8px 8px;
+}
+
+.SBResults A:hover, .SBResults A.SBSelected{
+        text-decoration:none;
+        background-color:#663366;
+        color:white;
+}
+
+.SBAddNewButton{
+        width:70px;
+        text-align:right;
+}
+
+.SBResults SPAN{
+        display:block;
+}
+
+.SBMain{
+        font-weight:bold;
+}
+
+.SBExtra{
+        font-size:9px;
+        padding-left:5px;
+}
+
+.SBHeader{
+        background:#EEEEEE;
+        text-align:right;       
+        padding:5px;
+        height:16px;
+}
+
+.SBFooter{
+        background:#EEEEEE;
+        text-align:right;
+        font-size:10px;
+        padding:5px;
+}

trunk/phpbms/common/stylesheet/mozilla/forms.css

@@ -93 +93 @@
 .buttonDown{background:url(image/button-down.png) 0 0 no-repeat;}
 .buttonDownDisabled{background:url(image/button-down-disabled.png) 0 0 no-repeat;}
+.buttonMap{background:url(image/button-map.png) 0 0 no-repeat;}
 .buttonWWW{background:url(image/button-www.png) 0 0 no-repeat;}
 .buttonX{background:url(image/button-x.png) 0 0 no-repeat;}

trunk/phpbms/common/stylesheet/mozilla/pages/client.css

@@ -8 +8 @@
 #leftSideDiv{padding-top:1px;margin-right:210px;}
 
-#id, #becameclient, #ds-salesmanagerid, #ccnumber, #ds-taxareaid, #comments{width:98%}
+#id, #becameclient, #ccnumber, #ds-taxareaid, #comments{width:98%}
 #type, #category, #leadsource,#paymentmethodid,#shippingmethodid,#discountid,#taxareaid{width:99%}
+#ds-salesmanagerid{
+        width:90%
+}
 
 #backtoorderP{padding-top:9px;}
@@ -17 +20 @@
 
 .phonelefts{float:left}
-#address1,#shiptoaddress1{margin-bottom:2px;}
+#address1{margin-bottom:2px;}
 
 .csz{float:left}

trunk/phpbms/common/stylesheet/mozilla/pages/invoice.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-#clientdisplay{
-        background-image:url("../image/search.gif");
-        background-repeat:no-repeat;
-        background-position:left;
-        padding-left:17px;
-}
-
-#clientSearchBox{
-        border:1px solid #999999;
-        background:white;
-        width:300px;
-        position:absolute;
-}
-
-#CSBResults{
- overflow:auto;
-}
-
-#CSBResults DIV{
-         color:#666666;
-         padding:5px;
-         font-style:italic;
-}
-
-#CSBResults A{
-        width:245px;/* 295 - 5 - 30 */
-        display:block;
-        color:#663366;
-        font-weight:normal;
-        padding:5px 3px 5px 30px;
-        background-repeat:no-repeat;
-        background-position:8px 8px;
-}
-
-#CSBResults A:hover, #CSBResults A.CSBSelected{
-        text-decoration:none;
-        background-color:#663366;
-        color:white;
-}
-
-#CSBAddNewButton{
-        width:70px;
-        text-align:right;
-}
-
-.client{
+.SBResults A.client{
+        padding-left:30px;
         background-image:url("../image/client.png");
 }
 
-.prospect{
+.SBResults A.prospect{
+        padding-left:30px;
         background-image:url("../image/prospect.png");
-}
-
-#CSBResults SPAN{
-        display:block;
-}
-
-.CSBMain{
-        font-weight:bold;
-}
-
-.CSBExtra{
-        font-size:9px;
-}
-
-#CSBHeader{
-        background:#EEEEEE;
-        text-align:right;       
-        padding:5px;
-        height:16px;
-}
-
-#CSBFooter{
-        background:#EEEEEE;
-        text-align:right;
-        font-size:10px;
-        padding:5px;
 }
 
@@ -87 +18 @@
 #printButton{ text-align:right;float:left;}
 #printButton input{width:75px;}
-
-#address1,#address2,#country,#leadsource{width:364px;}
 
 #fsAttributes{clear:both;float:right;width:260px;}
@@ -94 +23 @@
 #type{width:90px}
 #statusid{width:98%}
-#ds-assignedtoid{width:99%}
+#leadsource{
+        width:98%
+}
 
 
 #fsTops{margin-right:270px;}
-#address1{margin-bottom:2px;}
-.cszP{float:left;}
-#countryP{clear:left;}
+
+#billingAddressDiv, #shiptoAddressDiv{
+        clear:left;
+        border:1px solid #ACB7C4;
+        padding:8px;
+        margin:0 4px 4px;
+}
+
+.addressButtons{
+        width:75px;
+}
+
+#shiptoAddressDiv{
+        display:none;
+}
+
+#address1, #shiptoaddress1{
+        margin-top:2px;
+        margin-bottom:2px;
+}
+
+#fsAddresses{
+        display:block;
+        border:0;
+        margin:0;
+        padding:0;
+}
+
+#fsAddresses legend{
+        display:none;
+}
+
+.cityState{
+        float:left;
+}
+
+
+.showoptions{
+        width:100px;
+}
+
+.showoptions span{
+        display:inline;
+        padding-left:15px;
+        color : #455372; 
+        font-weight:bold;
+}
+
+#addressOptionsDivBilling, #addressOptionsDivShipTo {
+        display:none;
+}
+
+#LAPickDiv{
+        height:200px;
+        overflow:auto;
+        background:white;
+        border:1px solid #abb1b1;;
+}
+
+.LAPickAs {
+        display:block;
+        padding:8px;
+        border-bottom:1px solid #CCCCCC;
+        font-weight:normal;
+        color:black;
+}
+
+.LAPickAs:hover{
+        text-decoration:none;
+        background: #CCCCCC;
+}
+
+.LASel{
+        color:white;
+        background:black;
+}
+
+.LASel:Hover{
+        background:black;
+}
 
 #lineItemsFS{clear:both;}
@@ -120 +128 @@
 #ds-partname{width:135px;}
 
-#partnameHeader div{width:120px;}
-#memoHeader{width:100%}
+#memoHeader{
+        width:100%;
+}
+
 
 #memo, .lineitemMemos{width:100%;padding-right:0;border-right:0;}
@@ -177 +187 @@
 .invoiceTotalLabels div{height:24px; line-height:24px;vertical-align:bottom;}
 
-#parenInfo div{height:25px;clear:right;}
-#parenInfo div span{
-        display:block;
-        float:right;
-        line-height:24px;height:24px;
-        padding:0 4px;
+#parenInfo{
+        margin:0;
+        padding:0;
+        border:0;
+        border-collapse:separate;
+}
+
+#parenInfo td{
+        text-align:right;
+        line-height:24px;
         color:#666666;
+        padding:0 4px 0 4px;
+        border:0;
+        border-bottom:1px solid #CCCCCC;
+}
+
+#parenInfo td.blanks{
+        line-height:25px;
+        border:0;
+}
+
+#parenInfo td#parenSpacer{
+        height:55px;
 }
 
 #totalSpacer{height:55px;line-height:55px;border:0;}
 #totalSpacer span{border:0;}
-div #parenSpacer{height:55px;clear:right}
-div #parenSpacer span{height:55px;line-height:55px;border:0;}
-
 
 .vTabs,.vTabsHover{cursor:pointer;color:#455372;background:url(../image/button-rew.png) 5px 4px no-repeat;}

trunk/phpbms/common/stylesheet/mozilla/pages/quickview.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-#lookupByP{float:left; width:100px;padding-top:2px;}
-#lookupButtonsP{float:right;width:148px;padding-top:12px;text-align:right;}
-#dolookup,#addnew{width:70px}
-#lookupWhatP{margin:0 154px 0 108px;}
-.lookupWhats{width:90%;}
+.SBResults A.client{
+        padding-left:30px;
+        background-image:url("../image/client.png");
+}
+
+.SBResults A.prospect{
+        padding-left:30px;
+        background-image:url("../image/prospect.png");
+}
+
+#viewButton, #addButton{
+        width:70px
+}
+
+#clientIDDiv{
+        width:100%;
+        margin-right:200px;
+        margin-left: 170px;
+        background:red;
+}
+#ds-clientid{
+        width:55%;
+}
+
+
+
+
+#crTile.fsclient{
+        background-image:url("../image/client.png");
+}
+
+#crTile.fsprospect{
+        background-image:url("../image/prospect.png");
+}
+
+#crTile{
+        background:white no-repeat 13px 13px;
+}
+
+#crTile H1 {
+        background:none;
+        padding-left:26px;
+        font-weight:bold;
+}
+
+#crTile P{
+        margin: 5px 0 5px 42px;
+        padding: 0;
+}
+
+#crName{
+        font-size:14px;
+        font-weight:bold;
+        margin-top:0;
+}
+
+#crLocation{
+        font-size:10px;
+}
+
+.RDNames{
+        float:left; 
+        width:100px;
+        text-align:right;
+        font-weight:bold;
+}
+
+.RDData{
+        margin-left:120px;
+}
+
+.RDData UL {
+        margin:0;
+        padding:0;
+        padding-left:15px;
+}
+
+.RDData LI {
+        margin:0;
+        padding:0px 0px 5px 0;
+}
+
+#theclear{
+        clear:both;
+}
+
+
 .disabledP{display:none;}
 
 #theDetails{margin-top:15px;}
 #rightSideDiv{float:right;width:300px;margin-top:0;}
-#leftSideDiv{margin-right:328px;padding-top:1px;}
+#leftSideDiv{margin-right:308px;padding-top:1px;}
 
 H2{margin-top:5px;}
@@ -17 +99 @@
 .RDNames{float:left; width:100px;text-align:right;}
 .RDData{margin-left:120px;}
-.Uppers{font-size:15px;}
-#RDMemo{height:100px;overflow:auto;}
 
 #editClient{display:block;width:75px;float:right;}
@@ -31 +111 @@
 }
 
-#salesTable{height:190px;overflow:auto;}
-#notesTable{height:150px;overflow:auto;}
+#salesTable{height:140px;overflow:auto;}
+#notesTable{height:140px;overflow:auto;}