Changeset 192

Timestamp:

02/22/07 17:58:16

Author:

brieb

Message:

Implements #24

Files:

• trunk/phpbms/common/javascript/common.js (modified) (3 diffs)
• trunk/phpbms/common/javascript/fields.js (modified) (3 diffs)
• trunk/phpbms/common/stylesheet/mozilla/forms.css (modified) (1 diff)
• trunk/phpbms/common/stylesheet/mozilla/queryresults.css (modified) (1 diff)
• trunk/phpbms/include/common_functions.php (modified) (4 diffs)
• trunk/phpbms/include/fields.php (modified) (2 diffs)
• trunk/phpbms/include/jstransport.php (modified) (1 diff)
• trunk/phpbms/install/settings.sql (modified) (1 diff)
• trunk/phpbms/install/updatev0.7.sql (modified) (1 diff)
• trunk/phpbms/modules/base/adminsettings.php (modified) (2 diffs)
• trunk/phpbms/modules/base/include/notes_addedit_include.php (modified) (1 diff)
• trunk/phpbms/modules/base/javascript/notes.js (modified) (3 diffs)
• trunk/phpbms/modules/bms/discounts_addedit.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/include/discounts_addedit_include.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/include/invoices_addedit_include.php (modified) (6 diffs)
• trunk/phpbms/modules/bms/include/products_addedit_include.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/invoices_addedit.php (modified) (1 diff)
• trunk/phpbms/modules/bms/javascript/client.js (modified) (1 diff)
• trunk/phpbms/modules/bms/javascript/invoice.js (modified) (12 diffs)
• trunk/phpbms/modules/bms/javascript/product.js (modified) (1 diff)
• trunk/phpbms/modules/bms/products_addedit.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/quickview_ajax.php (modified) (1 diff)
• trunk/phpbms/modules/bms/report/invoices_pdfinvoice.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/report/invoices_pdfpackinglist.php (modified) (1 diff)
• trunk/phpbms/modules/bms/report/invoices_pdfquote.php (modified) (1 diff)
• trunk/phpbms/modules/bms/report/invoices_pdfworkorder.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/snapshot.php (modified) (2 diffs)

trunk/phpbms/common/javascript/common.js

@@ -179 +179 @@
-}
-
-function englishTime(thedate){
-                        var ampm = " AM";
-                        var hours = thedate.getHours()
-                        if(hours==0) hours=12;
-                        if (hours>12){
-                                var ampm = " PM";
-                                hours=hours-12
-                        }
-                        var minutes=thedate.getMinutes();
-                        if(minutes<10)
-                                minutes="0"+minutes;
-                        return hours+":"+minutes+ampm;
-}
-
-function englishDate(thedate){
-        return (thedate.getMonth()+1)+"/"+thedate.getDate()+"/"+thedate.getFullYear();  
-}
-
-function dateFromField(englishdate,englishtime){
-        var theyear= parseInt(englishdate.substring(englishdate.lastIndexOf("/")+1),10);
-        var themonth= parseInt(englishdate.substring(0,englishdate.indexOf("/")),10)-1;
-        var theday= parseInt(englishdate.substring(englishdate.indexOf("/")+1,englishdate.lastIndexOf("/")),10);
-        var thedate= new Date(theyear,themonth,theday);
-        if(englishtime){
-                var thehour=parseInt(englishtime.substring(0,englishtime.indexOf(":")),10);
-                var theminute=parseInt(englishtime.substring(englishtime.indexOf(":")+1,englishtime.indexOf(" ")),10);
-                var AMPM=englishtime.substring(englishtime.indexOf(" ")+1);
-                if(AMPM=="PM" && thehour!=12)
-                        thehour+=12;
-                else if (AMPM=="AM" && thehour==12)
-                        thehour=0;
-                thedate.setHours(thehour,theminute);
-        }
-        return thedate; 
-}
-
-/* DATE AND TIME --------------------------------------------------------------- */
-/* ----------------------------------------------------------------------------- */
+function stringToDatetime(sDate,sTime){
+        thedate=stringToDate(sDate)
+        if(sTime){
+                var thetime=stringToTime(sTime);
+                thedate.setHours(thetime.getHours());
+                thedate.setMinutes(thetime.getMinutes());
+                thedate.setSeconds(thetime.getSeconds());
+        }
+        return thedate;
+}
+
-function stringToDate(sDate,format){
-        if (!format) format=DATE_FORMAT;
@@ -253 +229 @@
-        if(thedate){
-                var sep;
+                var month;
+                var day;
-                switch(format){
-                        case "SQL":
-
-
+
+
+
+
+
+
-                        break;
-                        
-                        case "English, US":
-                                sep="/";
-
+
+
+
+
+
-                        break;
-                }
@@ -329 +315 @@
-        return sTime;
-}
+/* CURRENCY -------------------------------------------------------------------- */
+/* ----------------------------------------------------------------------------- */
+function numberToCurrency(number){
+        var currency="";
+        if(isNaN(parseFloat(number))) number=0;
+
+        if(number<0)
+                currency+="-";
+        number=Math.abs(number);
+        currency+=CURRENCY_SYMBOL;
+        if(number>0 && number <0)
+                currency+="0";
+
+        var withThousands=parseInt(number).toString();
+        var objRegExp  = new RegExp('(-?[0-9]+)([0-9]{3})');
+        while(objRegExp.test(withThousands))
+       withThousands = withThousands.replace(objRegExp, '$1'+THOUSANDS_SEPARATOR+'$2');
+
+        var lessthanone=Math.round((number-Math.round(number))*(Math.pow(10,CURRENCY_ACCURACY))).toString();
+        while(lessthanone.length<CURRENCY_ACCURACY)
+                lessthanone="0"+lessthanone;
+        currency+=withThousands;
+        if(CURRENCY_ACCURACY!=0)
+                currency+=DECIMAL_SYMBOL+lessthanone;
+        return currency;
+}
+
+function currencyToNumber(currency){
+        var number=0;
+        var thousSep=THOUSANDS_SEPARATOR;
+        if(thousSep=="." || thousSep=="*" || thousSep=="[" || thousSep=="]" || thousSep=="-" || thousSep=="+")
+                thousSep="\\"+thousSep;
+        var objRegExp  = new RegExp(thousSep,"g");
+        currency=currency.replace(objRegExp,"");
+        currency=currency.replace(CURRENCY_SYMBOL,"");
+        currency=currency.replace(DECIMAL_SYMBOL,".");
+        if(currency)
+                number=parseFloat(currency);
+        return number
+}
-
-/* MODAL ----------------------------------------------------------------------- */

trunk/phpbms/common/javascript/fields.js

@@ -218 +218 @@
-// checks and formats a field to dollars
-function validateCurrency(theitem){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        
-        //in case the field has an additional onchange code to be run
@@ -246 +231 @@
-}
-
-function formatCurrency(thenumber){
-        var newdollar,retval
-        thenumber=thenumber.toString(); 
-        //check for number              
-        if (isNaN(parseFloat(thenumber)) || thenumber.length!=((parseFloat(thenumber)).toString()).length) thenumber="0.00";
-
-        // add the dollar sign... remember that if it is a negative number, the minus sign goes in front
-        if(thenumber.charAt(0)=="-") {
-                        newdollar="-$";
-                        thenumber=thenumber.substring(1,thenumber.length);
-                } else newdollar="$";
-
-        var big_string = ""+(Math.round(100*(Math.abs(thenumber))))  //rounding the absolute value times 100
-        var biglen = big_string.length                            //how the string gets handled depends on its length
-        if (biglen == 0)                   //null
-                {retval = "0.00"} 
-        else if (biglen == 1)              //1 to 9 (.01 to .09 cents)
-                {retval = "0.0"+big_string}
-        else if (biglen == 2)              //10 to 99 (.10 to .99 cents)
-                {retval = "0."+big_string}
-        else  {                                                   //all cases above 100 ($1.00)
-                        //The substring method returns all characters in the string
-                        // starting with and including the the first argument,
-                        // up to but not including the second argument.  
-                        var hundredths_digit = big_string.substring(biglen-1,biglen)  
-                        var tenths_digit = big_string.substring(biglen-2,biglen-1)    
-                        var integer_digits = big_string.substring(0,biglen-2)
-                        // commafy,  borrowed from Danny Goodman, "Javascript Bible"
-                        var re = /(-?\d+)(\d{3})/
-                        while (re.test(integer_digits))  {
-                                integer_digits = integer_digits.replace(re, "$1,$2")
-                        }
-                        retval = integer_digits + "." + tenths_digit + hundredths_digit
-        }  
-    newdollar = newdollar+retval;
-        
-        return newdollar;
-}
-
-function currencyToNumber(thecurrency){
-        var i;
-        var thenumber="";
-        for(i=0;i<thecurrency.length;i++){
-                if (thecurrency.charAt(i)!="$" && thecurrency.charAt(i)!="+" && thecurrency.charAt(i)!=",") thenumber=thenumber+thecurrency.charAt(i);
-        }
-        //if the first number is a ".", add a 0
-        if (thenumber.charAt(0)==".") thenumber="0"+thenumber;
-
-        //get rid of trailing zeros and possibly "."
-        while(thenumber.charAt(thenumber.length-1)=="0" && thenumber.indexOf(".")!=-1) thenumber=thenumber.substring(0,thenumber.length-1);
-        if(thenumber.charAt(thenumber.length-1)==".") thenumber=thenumber.substring(0,thenumber.length-1);
-        
-        if (isNaN(parseFloat(thenumber)) || thenumber.length!=((parseFloat(thenumber)).toString()).length) thenumber="0.00";    
-        
-        thenumber=parseFloat(thenumber);
-        return thenumber;
-}
-
-
-function  processUniqueReqChange(){
-         if (req.readyState == 4) {
-                // only if "OK"
-                if (req.status == 200) {                        
-                        var response = req.responseXML.documentElement;
-                        var thename = response.getElementsByTagName('name')[0].firstChild.data;
-                        var isunique = response.getElementsByTagName('isunique')[0].firstChild.data;
-                        
-                        if(isunique==0)
-                                alert("This field requires a unique value.<br/><br/>Another record already exists with this value.");
-                }
-        }
-}
-
-function getNumberFromPercentage(thenumber){
@@ -337 +250 @@
-        
-        var theurl=path+"checkunique.php?value="+encodeURIComponent(thevalue);
-thetable
-thename
-thefield
-excludeid
+encodeURIComponent(thetable)
+encodeURIComponent(thename)
+encodeURIComponent(thefield)
+parseInt(excludeid)
-
-        loadXMLDoc(theurl,processUniqueReqChange,true);

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

@@ -14 +14 @@
-FORM{margin:0px;padding:0px;}
-
-
+
-.uneditable,.uneditable:Focus {background-color:transparent; border-color:#ABB1B1;color:#666666;}
-.disabledtext{color:#CCCCCC;}

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

@@ -41 +41 @@
-
-.querytable td.queryfooter, .queryfooter{
+        white-space:nowrap;
-        background:#BBBBBB;
-        border:1px solid #999999;

trunk/phpbms/include/common_functions.php

@@ -132 +132 @@
-
-// date/time functions
-// It will add the quotes for you.
-//=====================================================================
-define("DATE_FORMAT",$_SESSION["date_format"]);
@@ -308 +307 @@
-}
-
+// Currency functions
+//=====================================================================
+function numberToCurrency($number){
+        $currency="";
+        if($number<0)
+                $currency.="-";
+        $currency.=$_SESSION["currency_symbol"].number_format(abs($number),$_SESSION["currency_accuracy"],$_SESSION["decimal_symbol"],$_SESSION["thousands_separator"]);
+        return $currency;
+}
+
+function currencyToNumber($currency){
+        $number=str_replace($_SESSION["currency_symbol"],"",$currency);
+        $number=str_replace($_SESSION["thousands_separator"],"",$number);
+        $number=str_replace($_SESSION["decimal_symbol"],".",$number);
+        $number=((real) $number);
+        
+        return $number;
+}
+
+
-
-//============================================================================
@@ -371 +390 @@
-}
-
-function currencyFormat($number){
-        if(!is_numeric($number)) return $number;
-        if($number <0)
-                $thenumber="-$".number_format(abs($number),2);
-        else
-                $thenumber="$".number_format($number,2);
-        return $thenumber;
-}
-
-function booleanFormat($bool){
-        if($bool==1)
@@ -391 +401 @@
-        switch($format){
-                case "currency":
-currencyFormat
+numberToCurrency
-                break;
-                case "boolean":

trunk/phpbms/include/fields.php

@@ -235 +235 @@
-
-//============================================================================================
-dollar
-
-
- 
+currency
+
+
+
-           required =           true/false wether the field is validated by javascript before submitting for blank values
-           message =            message displayed if not validate                                               
@@ -246 +246 @@
-
-        if(!is_numeric($value)) $value=0;
-currencyFormat
+numberToCurrency
-        
-        ?><input name="<?php echo $name?>" id="<?php echo $name?>" type="text" value="<?php echo $value?>" <?php
-
-
+
+
+
+
+
-        if ($required) {?><script language="JavaScript" type="text/javascript">requiredArray[requiredArray.length]=new Array('<?php echo $name?>','<?php echo $message?>');</script><?php }//end required if
-}

trunk/phpbms/include/jstransport.php

@@ -23 +23 @@
-        ?>TIME_FORMAT="<?php echo $_SESSION["time_format"]?>";<?php
-        echo "\n\n";
+
+        //currency formating
+        ?>CURRENCY_SYMBOL="<?php echo $_SESSION["currency_symbol"]?>";<?php
+        echo "\n";
+        ?>CURRENCY_ACCURACY=<?php echo $_SESSION["currency_accuracy"]?>;<?php
+        echo "\n";
+        ?>DECIMAL_SYMBOL="<?php echo $_SESSION["decimal_symbol"]?>";<?php
+        echo "\n";
+        ?>THOUSANDS_SEPARATOR="<?php echo $_SESSION["thousands_separator"]?>";<?php
+        echo "\n";
+
-        
-        if(isset($_SESSION["include_js"])){

trunk/phpbms/install/settings.sql

@@ -11 +11 @@
-INSERT INTO `settings` (`name`, `value`) VALUES ('date_format','English, US');
-INSERT INTO `settings` (`name`, `value`) VALUES ('time_format','12 Hour');
+INSERT INTO `settings` (`name`, `value`) VALUES ('currency_symbol','$');
+INSERT INTO `settings` (`name`, `value`) VALUES ('decimal_symbol','.');
+INSERT INTO `settings` (`name`, `value`) VALUES ('thousands_separator',',');
+INSERT INTO `settings` (`name`, `value`) VALUES ('currency_accuracy','2');

trunk/phpbms/install/updatev0.7.sql

@@ -63 +63 @@
-INSERT INTO `settings` (`name`, `value`) VALUES ('date_format','English, US');
-INSERT INTO `settings` (`name`, `value`) VALUES ('time_format','12 Hour');
+INSERT INTO `settings` (`name`, `value`) VALUES ('currency_symbol','$');
+INSERT INTO `settings` (`name`, `value`) VALUES ('decimal_symbol','.');
+INSERT INTO `settings` (`name`, `value`) VALUES ('thousands_separator',',');

trunk/phpbms/modules/base/adminsettings.php

@@ -113 +113 @@
-                <p>
-                        <label for="sencryption_seed">encryption seed</label><br />
-Application
+Encryption seed
-                </p>
-
@@ -211 +211 @@
-                        </select>
-                </p>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </fieldset>
-        <?php 

trunk/phpbms/modules/base/include/notes_addedit_include.php

@@ -207 +207 @@
-                        if(isset($variables["completed"])) {
-                                $querystatement.="completed=1, "; 
-
+\"
-                        }else {
-                                $querystatement.="completed=0, completeddate=NULL, ";

trunk/phpbms/modules/base/javascript/notes.js

@@ -176 +176 @@
-                var endtimefield=getObjectFromID("endtime");
-                var starttimefield=getObjectFromID("starttime");
-dateFromField
-dateFromField
+stringToDatetime
+stringToDatetime
-                if (thestart>theend){
-                        theend=thestart;
-                        theend.setHours(theend.getHours()+1);
-englishDate
+dateToString
-                        if(starttimefield.value)
-englishTime
+timeToString
-                }
-        }
@@ -219 +219 @@
-                        if(type=="end")
-                                today.setHours(today.getHours()+1);
-englishDate
-englishTime
+dateToString
+timeToString
-                }
-                thetext.className=null;
@@ -370 +370 @@
-        var startdate= getObjectFromID("startdate");
-        if(startdate.value=="") return false;
-dateFromField
+stringToDatetime
-        var theday= parseInt(startdate.value.substring(startdate.value.indexOf("/")+1,startdate.value.lastIndexOf("/")),10);
-        

trunk/phpbms/modules/bms/discounts_addedit.php

@@ -79 +79 @@
-                        <p>
-                                <strong>Orders</strong> (<?php echo $stats["Order"]["total"]?>)<br/>
-currencyFormat
+numberToCurrency
-                        </p>
-                        <p>
-                                <strong>Invoices</strong> (<?php echo $stats["Invoice"]["total"]?>)<br />
-currencyFormat
+numberToCurrency
-                        </p>
-                </fieldset>
@@ -109 +109 @@
-                        <p id="aValue">
-                                <label for="amountvalue">value</label><br />
-dollar
+currency
-                        </p>                    
-                </fieldset>

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

@@ -123 +123 @@
-                                        $variables["percentvalue"]="0";
-                                $querystatement.="value=".$variables["percentvalue"].", "; 
-
-
-
-
+
+
-
-        //==== Almost all records should have this =========
@@ -158 +156 @@
-                                        $variables["percentvalue"]="0";
-                                $querystatement.=$variables["percentvalue"].", "; 
-
-
-
-
+
+
-                                
-        //==== Almost all records should have this =========

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

@@ -146 +146 @@
-                        while($therecord=mysql_fetch_array($queryresult)){
-                                if($therecord["type"]=="amount")
-currencyFormat
+numberToCurrency
-                                else
-                                        $therecord["value"].="%";
@@ -168 +168 @@
-                        $therecord["name"].=": ".$therecord["value"];
-                } else
-currencyFormat
+numberToCurrency
-        }
-        $therecord["name"]=htmlspecialchars($therecord["name"]);
@@ -447 +447 @@
-                        $querystatement.="orderdate=".$tempdate.", "; 
-
-
-
+
-                        if($variables["discountid"]=="")$variables["discountid"]="NULL";
-                        $querystatement.="discountid=".$variables["discountid"].", "; 
@@ -467 +466 @@
-                        $querystatement.="country=\"".$variables["country"]."\", "; 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-                        $querystatement.="totalcost=".$variables["totalcost"].", "; 
@@ -565 +557 @@
-                        $querystatement.=((int)$variables["statusid"]).", ";
-                        $querystatement.=((int) $variables["assignedtoid"]).", ";
- || $variables["statusdate"]=="0/0/0000"
+
-                        else
-                                $tempdate="\"".sqlDateFromString($variables["statusdate"])."\"";
-                        $querystatement.=$tempdate.", ";
-                        
- || $variables["orderdate"]=="0/0/0000"
+
-                                else
-                                        $tempdate="\"".sqlDateFromString($variables["orderdate"])."\"";
-                        $querystatement.=$tempdate.", "; 
-
-
-
+
-                        if($variables["discountid"]=="")$variables["discountid"]="NULL";
-                        $querystatement.=$variables["discountid"].", "; 
-
- || $variables["invoicedate"]=="0/0/0000"
+
-                                else
-                                        $tempdate="\"".sqlDateFromString($variables["invoicedate"])."\"";
@@ -595 +586 @@
-                        $querystatement.="\"".$variables["country"]."\", "; 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-                        $querystatement.=$variables["totalcost"].", "; 

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

@@ -142 +142 @@
-                        if(isset($variables["inactive"])) $querystatement.="inactive=1, "; else $querystatement.="inactive=0, ";
-                        if(isset($variables["taxable"])) $querystatement.="taxable=1, "; else $querystatement.="taxable=0, ";
-
-
-
-
-
-
+
+
+
-                        $querystatement.="unitofmeasure=\"".$variables["unitofmeasure"]."\", "; 
-
@@ -239 +236 @@
-                        if(isset($variables["taxable"])) $querystatement.="1, "; else $querystatement.="0, ";
-                        $querystatement.="\"".$variables["memo"]."\", "; 
-
-
-
-
-
-
+
+
+
-                        $querystatement.="\"".$variables["unitofmeasure"]."\", "; 
-

trunk/phpbms/modules/bms/invoices_addedit.php

@@ -234 +234 @@
-                        </td>
-                        <td width="100%"><input name="memo" type="text" id="memo" size="12" maxlength="255" tabindex="17" /></td>
-currencyFormat
+numberToCurrency
-                        <td align="center" nowrap><input name="qty" type="text" id="qty" value="1" size="5" maxlength="16" onchange="calculateExtended()" tabindex="19"  /></td>
-