Changeset 762

Timestamp:

01/15/10 13:13:56 (2 years ago)

Author:

brieb

Message:

• Fixed invoice creation error reporting
• Added getDefaults to API and wrapper

Location:

trunk/phpbms/modules

Files:

• api/apiwrapper.php (modified) (1 diff)
• api/include/apiclass.php (modified) (2 diffs)
• bms/include/invoices.php (modified) (7 diffs)

trunk/phpbms/modules/api/apiwrapper.php

@@ -258 +258 @@
 
     }//end function
+
+
+    /**
+     * function getDefaults
+     *
+     */
+
+    function getDefaults($tabledefuuid){
+
+        $params["request"][0]["command"] = "getDefaults";
+        $params["request"][0]["data"] = "";
+        $params["request"][0]["tabledefid"] = $tabledefuuid;
+
+        $response = $this->_callServer($params);
+
+        if($response !== false)
+            return $response[0];
+        else
+            return false;
+        
+    }//end function getDefaults
 
 

trunk/phpbms/modules/api/include/apiclass.php

@@ -464 +464 @@
                         break;
 
+                    case "getDefaults":
+
+                        include_once("include/tables.php");
+
+                        if($hasTableClassOveride){
+
+                            @ include_once("modules/".$modulename."/include/".$maintable.".php");
+
+                            if(class_exists($maintable)){
+
+                                $processor = new $maintable($this->db, $tabledefid);
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
+
+                            }else{
+
+                                $processor = new phpbmsTable($this->db, $tabledefid);
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
+
+                            }//end if
+
+                        } else {
+
+                            $processor = new phpbmsTable($this->db, $tabledefid);
+                            $processor->dateFormat =  $this->options->dateFormat;
+                            $processor->timeFormat =  $this->options->timeFormat;
+
+                        }//end if
+
+                        $therecord = $processor->getDefaults();
+                        
+                        $this->_addToResponse("retrieved", "defaults retrieved in tabledef ".$tabledefid, $therecord);
+
+                       break;
+
                     case "insert":
                         //======================================================
@@ -616 +652 @@
 
                         if($errorMessage)
-                            $this->sendError("Update failed from request number ".$i, $errorMessage);
+                            $this->sendError("Get failed from request number ".$i, $errorMessage);
                         elseif(!$this->options->useUuid){
                             $therecord = $processor->getRecord((int) $request["data"]["id"], $this->options->useUuid);

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

@@ -625 +625 @@
                         $therecord["taxpercentage"]=$taxinfo["percentage"];
                         $therecord["amountdue"]=0;
+                        $therecord["amountpaid"]=0;
 
                         $therecord["hascredit"]=0;
@@ -632 +633 @@
                         $therecord["thelineitems"] = array();
                         $therecord["cmid"] = "";
+
+                        $therecord["lineitemschanged"] = "";
 
                         return $therecord;
@@ -833 +836 @@
                                         $this->verifyErrors[] = "The `statusid` field does not give an existing/acceptable status id number.";
 
-                        }//end if
+                        } else {
+
+                                $this->verifyErrors[] = "The `statusid` field must be set.";
+
+                        }//end if
 
                         //check booleans
@@ -1187 +1194 @@
                                 require_once("addresstorecord.php");
 
+                                if(!isset($variables["uuid"]))
+                                    $variables["uuid"] = getUuid($this->db, $this->uuid, $newid);
+
                                 $newuuid = mysql_real_escape_string($variables["uuid"]);
 
@@ -1194 +1204 @@
                         }//end if
 
+
+                        if(!isset($variables["lineitemschanged"]))
+                            $variables["lineitemschanged"] ='';
 
                         if($variables["lineitemschanged"]==1){
@@ -1206 +1219 @@
                         }//end if
 
+                        if(!isset($variables["statusdate"]))
+                            $variables["statusdate"] ='';
+
+                        if(!isset($variables["assignedtoid"]))
+                            $variables["assignedtoid"] ='';
+
                         //if($variables["statuschanged"]==1)
-                                $this->updateStatus($id,$variables["statusid"],$variables["statusdate"],$variables["assignedtoid"], $replace);
+                        $this->updateStatus($id, $variables["statusid"], $variables["statusdate"], $variables["assignedtoid"], $replace);
 
                         if($variables["clienttype"] == "prospect" && $variables["type"] == "Order")
@@ -2061 +2080 @@
 
                                 }//end foreach
-                                
+
                                 if($count == count($this->idsArray))
                                         $message = $count." related credit memo(s) have been created.";
                                 else
                                         $message = $count." related credit memo(s) (of ".count($this->idsArray)." selected) have been created.";
-                                
+
                                 return $message;