Changeset 645 for trunk/phpbms/modules

Timestamp:

10/06/09 13:20:39 (3 years ago)

Author:

nate

Message:

• Added pushrecords table. This will store server/script information and how the push works.
• Added push class which will get the information from records of tables with tabledefids and push them to server/script specified in a pushrecord.
• Added ability to apply pushes to search options (tableoptions).
• Added ability to automatically run pushes via the scheduler.

Location:

trunk/phpbms/modules

Files:

• api/include/apiclass.php (modified) (15 diffs)
• api/install/createtables.sql (modified) (1 diff)
• api/install/install.php (modified) (1 diff)
• base/cron.php (modified) (3 diffs)
• base/include/scheduler.php (modified) (5 diffs)
• base/include/tabledefs.php (modified) (2 diffs)
• base/include/tabledefs_options_include.php (modified) (12 diffs)
• base/javascript/tableoptions.js (modified) (3 diffs)
• base/scheduler_addedit.php (modified) (3 diffs)
• base/smartsearches_addedit.php (modified) (1 diff)
• base/tabledefs_options.php (modified) (2 diffs)
• bms/include/clients.php (modified) (1 diff)
• bms/javascript/invoice.js (modified) (5 diffs)

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

@@ -73 +73 @@
 
     /**
+      *  $options
+      *  @var object Object containing the current request's options
+      */
+    var $options;
+
+    /**
      * function api
      *
@@ -127 +133 @@
      * encodes data (usually {@link $request}) depending on the {@link $format}
      *
-     * Currently, this function can only decode JSON data, but support for SOAP,
+     * Currently, this function can only encode JSON data, but support for SOAP,
      * generic XML, or some other format may be added
      *
@@ -204 +210 @@
     }//end function isValidTimeFormat
 
+
+    /**
+     * function processOptions
+     * @param array $options
+     */
+
+    function processOptions($options) {
+
+        $this->options->useUuid = true;
+            if(isset($options["useUuid"]))
+                $this->options->useUuid = (bool)$options["useUuid"];
+
+        /**
+          *   date format options
+          */
+
+        $this->options->dateFormat = "SQL";
+        if(defined("DATE_FORMAT"))
+            $this->options->dateFormat = DATE_FORMAT;
+
+        if(isset($options["dateFormat"]))
+            if($this->isValidDateFormat($options["dateFormat"]))
+                $this->options->dateFormat = $options["dateFormat"];
+
+        /**
+          *  Time format options
+          */
+
+        $this->options->timeFormat = "24 Hour";
+        if(defined("TIME_FORMAT"))
+            $this->options->timeFormat = TIME_FORMAT;
+
+        if(isset($options["timeFormat"]))
+            if($this->isValidTimeFormat($options["timeFormat"]))
+                $this->options->timeFormat = $options["timeFormat"];
+
+        /**
+          *  Id field options
+          *
+          *  This option dictates whether or not to keep the destination's
+          *  id field if "replacing" (via the mysql replace) when there is
+          *  no id field set.
+          */
+        $this->options->keepDestId = true;
+        if(isset($options["keepDestId"]))
+            $this->options->keepDestId = (bool)$options["keepDestId"];
+
+    }//end method --processOptions--
 
     /**
@@ -221 +275 @@
         $tabledefid = null;
 
-        /**
-          *  @var bool $useUuid Whether or not to update/get/delete a record using the
-          *  uuid instead of the id. Default is true.
-          */
-        $useUuid = true;
-
         if(!is_array($this->data))
             $this->sendError("Passed data malformed.  Was expecting an array.", $this->data, true);
@@ -238 +286 @@
                 $this->sendError("Malformed request number ".$i, $request);
 
-            $useUuid = true;
-            if(isset($request["options"]["useUuid"]))
-                $useUuid = (bool)$request["options"]["useUuid"];
-
             /**
-              *   date format options
+              *  Process the options and populate the options object.
               */
-
-            $dateFormat = "SQL";
-            if(defined("DATE_FORMAT"))
-                $dateFormat = DATE_FORMAT;
-
-            if(isset($request["options"]["dateFormat"]))
-                if($this->isValidDateFormat($request["options"]["dateFormat"]))
-                    $dateFormat = $request["options"]["dateFormat"];
-
-            /**
-              *  Time format options
-              */
-
-            $timeFormat = "24 Hour";
-            if(defined("TIME_FORMAT"))
-                $timeFormat = TIME_FORMAT;
-
-            if(isset($request["options"]["dateFormat"]))
-                if($this->isValidTimeFormat($request["options"]["dateFormat"]))
-                    $timeFormat = $request["options"]["timeFormat"];
+            if(!isset($request["options"]))
+                $request["options"] = NULL;
+
+            $this->processOptions($request["options"]);
 
             if((int) $request["tabledefid"] !== $tabledefid){
@@ -354 +382 @@
 
                     $processor = new $className($this->db);
-                    $processor->dateFormat =  $dateFormat;
-                    $processor->timeFormat =  $timeFormat;
+                    $processor->dateFormat =  $this->options->dateFormat;
+                    $processor->timeFormat =  $this->options->timeFormat;
 
                     if(!method_exists($processor, $request["command"])) {
@@ -380 +408 @@
                 if(class_exists($maintable)){
                     $processor = new $maintable($this->db, $tabledefid);
-                    $processor->dateFormat =  $dateFormat;
-                    $processor->timeFormat =  $timeFormat;
+                    $processor->dateFormat =  $this->options->dateFormat;
+                    $processor->timeFormat =  $this->options->timeFormat;
                 }else{
                     $processor = new phpbmsTable($this->db, $tabledefid);
-                    $processor->dateFormat =  $dateFormat;
-                    $processor->timeFormat =  $timeFormat;
+                    $processor->dateFormat =  $this->options->dateFormat;
+                    $processor->timeFormat =  $this->options->timeFormat;
                 }
 
@@ -439 +467 @@
                             if(class_exists($maintable)){
                                 $processor = new $maintable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }else{
                                 $processor = new phpbmsTable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }//end if
 
                         } else{
                             $processor = new phpbmsTable($this->db, $tabledefid);
-                            $processor->dateFormat =  $dateFormat;
-                            $processor->timeFormat =  $timeFormat;
+                            $processor->dateFormat =  $this->options->dateFormat;
+                            $processor->timeFormat =  $this->options->timeFormat;
                         }//end if
 
@@ -461 +489 @@
                             $overrideID = false;
                             if(is_array($request["data"]))
-                                if(isset($request["data"]["id"]))
+                                if(isset($request["data"]["id"])){
+
                                     if(((int)$request["data"]["id"]) !== 0)
                                         $overrideID = true;
+                                    if($this->options->keepDestId && isset($request["data"]["uuid"]) && $this->options->useUuid)
+                                        $request["data"]["id"] = getId($this->db, $processor->uuid, $request["data"]["uuid"]);
+
+                                }elseif($this->options->keepDestId && isset($request["data"]["uuid"]) && $this->options->useUuid)
+                                    $request["data"]["id"] = getId($this->db, $processor->uuid, $request["data"]["uuid"]);
 
                             $createUuid = true;
@@ -471 +505 @@
                                         $overrideID = true;
                                         $createUuid = false;
-                                    }
+                                    }//end if
 
                             if(!isset($processor->fields["uuid"]))
                                 $createUuid = false;
 
-                            $newid = $processor->insertRecord($request["data"], null, $overrideID, true, $createUuid);
+                            $newid = $processor->insertRecord($request["data"], NULL, $overrideID, true, $createUuid);
 
                             if($newid){
@@ -503 +537 @@
                             if(class_exists($maintable)){
                                 $processor = new $maintable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }else{
                                 $processor = new phpbmsTable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }//end if
 
                         } else {
                             $processor = new phpbmsTable($this->db, $tabledefid);
-                            $processor->dateFormat =  $dateFormat;
-                            $processor->timeFormat =  $timeFormat;
+                            $processor->dateFormat =  $this->options->dateFormat;
+                            $processor->timeFormat =  $this->options->timeFormat;
                         }//end if
 
                         $errorArray = $processor->verifyVariables($request["data"]);
 
-                        if($useUuid){
+                        if($this->options->useUuid){
                             if(!isset($request["data"]["uuid"]))
                                 $errorArray[] = "The `uuid` field must be set.";
@@ -532 +566 @@
                         else {
 
-                            $processor->updateRecord($request["data"], NULL, (bool)$useUuid);
+                            $processor->updateRecord($request["data"], NULL, (bool)$this->options->useUuid);
 
                             $this->_addToResponse("updated", "record updated in tabledef ".$tabledefid);
@@ -551 +585 @@
                             if(class_exists($maintable)){
                                 $processor = new $maintable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }else{
                                 $processor = new phpbmsTable($this->db, $tabledefid);
-                                $processor->dateFormat =  $dateFormat;
-                                $processor->timeFormat =  $timeFormat;
+                                $processor->dateFormat =  $this->options->dateFormat;
+                                $processor->timeFormat =  $this->options->timeFormat;
                             }//end if
 
                         } else {
                             $processor = new phpbmsTable($this->db, $tabledefid);
-                            $processor->dateFormat =  $dateFormat;
-                            $processor->timeFormat =  $timeFormat;
+                            $processor->dateFormat =  $this->options->dateFormat;
+                            $processor->timeFormat =  $this->options->timeFormat;
                         }//end if
 
-                        if(!$useUuid){
-                            $therecord = $processor->getRecord((int) $request["data"]["id"], $useUuid);
+                        if(!$this->options->useUuid){
+                            $therecord = $processor->getRecord((int) $request["data"]["id"], $this->options->useUuid);
                             $thereturn = $therecord["id"];
                             $thevalue = (int)$request["data"]["id"];
                         }else{
-                            $therecord = $processor->getRecord(mysql_real_escape_string($request["data"]["uuid"]), $useUuid);
+                            $therecord = $processor->getRecord(mysql_real_escape_string($request["data"]["uuid"]), $this->options->useUuid);
                             $thereturn = $therecord["uuid"];
                             $thevalue = $request["data"]["uuid"];
@@ -620 +654 @@
 
 
-                            $result = $processor->delete_record($useUuid);
+                            $result = $processor->delete_record($this->options->useUuid);
 
                             $this->_addToResponse($request["command"], $result);
@@ -733 +767 @@
 
                                     $processor = new $className($this->db, $tabledefid, $request["data"]);
-                                    $processor->dateFormat =  $dateFormat;
-                                    $processor->timeFormat =  $timeFormat;
+                                    $processor->dateFormat =  $this->options->dateFormat;
+                                    $processor->timeFormat =  $this->options->timeFormat;
 
                                     $methodName = $request["command"];

trunk/phpbms/modules/api/install/createtables.sql

@@ +1 @@
+CREATE TABLE `pushrecords` (
+  `id` int(11) NOT NULL auto_increment,
+  `uuid` varchar(64) NOT NULL,
+  `originuuid` varchar(64) NOT NULL default '',
+  `destuuid` varchar(64) NOT NULL default '',
+  `apicommand` varchar(128) NOT NULL default 'insert',
+  `whereclause` varchar(256) NOT NULL default '',
+  `destscript` varchar(256) NOT NULL default '',
+  `name` varchar(128) NOT NULL default '',
+  `apiusername` varchar(128) NOT NULL default '',
+  `apipassword` varchar(128) NOT NULL default '',
+  `port` int(11) default NULL,
+  `server` varchar(255) NOT NULL default '',
+  `ssl` tinyint(4) NOT NULL default '0',
+  `httpformat` varchar(64) NOT NULL default 'POST',
+  `dataformat` varchar(64) NOT NULL default 'json',
+  `keepdestid` tinyint(1) NOT NULL default '0',
+  `useuuid` tinyint(1) NOT NULL default '0',
+  `dateformat` varchar(64) NOT NULL default 'SQL',
+  `timeformat` varchar(64) NOT NULL default '24 Hour',
+  `extraoptions` text,
+  `createdby` int(11) NOT NULL default '0',
+  `creationdate` datetime NOT NULL default '0000-00-00 00:00:00',
+  `modifiedby` int(11) default '0',
+  `modifieddate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `uuid` (`uuid`)
+) ENGINE=InnoDB;

trunk/phpbms/modules/api/install/install.php

@@ -18 +18 @@
 $theModule->tables = array(
                         "modules",
+            "tablecolumns",
+            "tabledefs",
+            "tablefindoptions",
+            "tableoptions",
+            "tablesearchablefields"
                         );
 

trunk/phpbms/modules/base/cron.php

@@ -16 +16 @@
         $now = gmdate('Y-m-d H:i', strtotime('now'));
 
-        $querystatment = "
+        $querystatement = "
                 SELECT
                         id,
                         name,
                         crontab,
+                        IF(`pushrecordid` != '', 'pushrecord', 'job') AS `type`,
                         job,
+                        `pushrecordid`,
                         startdatetime,
                         enddatetime
@@ -31 +33 @@
                         AND (enddatetime > NOW() OR enddatetime IS NULL)";
 
-        $queryresult=$db->query($querystatment);
+        $queryresult=$db->query($querystatement);
 
         while($schedule_record=$db->fetchArray($queryresult)){
@@ -51 +53 @@
                 if(is_array($validTimes) && in_array($now, $validTimes)){
 
-                        $success = @ include($schedule_record["job"]);
+                        switch($schedule_record["type"]){
+                                
+                                case "job":
+                                        $success = @ include($schedule_record["job"]);
+                                        break;
+                        
+                                case "pushrecord":      
+                                        include_once("modules/api/include/push.php");
+                                        $push = new push($db, $schedule_record["pushrecordid"]);
+                                        $success = $push->process();
+                                        break;
+                                
+                        }//end switch
 
                         if($success){

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

@@ -56 +56 @@
                         $therecord["enddate"]="";
                         $therecord["endtime"]="";
+                        
+                        $therecord["scripttype"] = "job";
 
                         return $therecord;
@@ -65 +67 @@
                         $therecord = parent::getRecord($id, $useUuid);
 
+                        if($therecord["job"])
+                                $therecord["scripttype"] = "job";
+                        else
+                                $therecord["scripttype"] = "pushrecord";
+                        
+                        
+                        
                         $datearray=explode(" ",$therecord["startdatetime"]);
                         $therecord["startdate"]=$datearray[0];
@@ -88 +97 @@
 
                 function verifyVariables($variables){
-
-                        //must have the file that has the job that will
-                        //be run.
+                        
+                        $validJob = true;
                         if(isset($variables["job"])){
-                                if(!$variables["job"] === "" || $variables["job"] === NULL)
-                                        $this->verifyErrors[] = "The `job` field must not be blank.";
+                                if($variables["job"] === "" || $variables["job"] === NULL)
+                                        $validJob = false;
                         }else
-                                $this->verifyErrors[] = "The `job` field must be set.";
+                                $validJob = false;
+                                
+                        $validPush = true;
+                        if(isset($variables["pushrecordid"])){
+                                if($variables["pushrecordid"] === "" || $variables["pushrecordid"] === NULL)
+                                        $validPush = false;
+                        }else
+                                $validPush = false;
+                        
+                        if(!$validPush && !$validJob)
+                                $this->verifyErrors[] = "The `job` or the `pushrecordid` must be set and not blank.";
 
                         //checks to see if crontab is in the (somewhat) right format
@@ -103 +121 @@
                                         $this->verifyErrors[] = "The `crontab` field is not of the proper form.  There must be four pairs of '::' in the field's value.";
                         }//end if
-
+                        
                         return parent::verifyVariables($variables);
 
@@ -133 +151 @@
                                 $variables["enddatetime"] = NULL;
 
-
+                        switch($variables["scripttype"]){
+                                
+                                case "job":
+                                        $variables["pushrecordid"] = "";
+                                        break;
+                                        
+                                case "pushrecord":
+                                        $variables["job"] = "";
+                                        break;
+                                
+                        }//end switch
+                        
                         return $variables;
-                }
+                
+                }//end function
 
         }//end class

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

@@ -46 +46 @@
                         $therecord = parent::getDefaults();
 
-                        $therecord["moduleid"]=1;
+                        $therecord["moduleid"]="mod:29873ee8-c12a-e3f6-9010-4cd24174ffd7";
                         $therecord["deletebutton"]="delete";
                         $therecord["type"]="table";
-                        $therecord["searchroleid"]=0;
-                        $therecord["importroleid"]=-100;
-                        $therecord["advsearchroleid"]=-100;
-                        $therecord["viewsqlroleid"]=-100;
+                        $therecord["searchroleid"] = "";
+                        $therecord["importroleid"] = "Admin";
+                        $therecord["advsearchroleid"] = "Admin";
+                        $therecord["viewsqlroleid"] = "Admin";
 
                         return $therecord;
@@ -269 +269 @@
                         //and last findfields
                         $querystatement = "INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`)
-                        VALUES ('".$variables["uuid"]."','".$variables["maintable"].".uuid','uuid',1,'field');";
+                        VALUES ('".$variables["uuid"]."','".$variables["maintable"].".id','id',1,'field');";
                         $this->db->query($querystatement);
 

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

@@ -44 +44 @@
         var $tabledefuuid;
         var $tablename;
+        var $hasRelatedPushRecord = false;
 
         function tableOptions($db, $tabledefid){
@@ -64 +65 @@
 
             $this->tabledefuuid = $therecord["uuid"];
+
+            /**
+              *  Check for push records
+              */
+            //if(isset($phpbms)){
+            //    if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){
+            //        $querystatement = "
+            //            SELECT
+            //                `id`
+            //            FROM
+            //                `pushrecords`
+            //            WHERE
+            //                `originuuid` = '".$this->tabledefuuid."'
+            //        ";
+            //
+            //        $queryresult = $this->db->query($querystatement);
+            //        if($this->db-numRows($queryresult))
+            //            $this->hasRelatedPushRecord = true;
+            //
+            //    }
+            //}
+
             $this->tablename = formatVariable($therecord["displayname"]);
 
@@ -71 +94 @@
         function getDefaults(){
 
-            return array(
+            $thereturn = array(
                 "id" => NULL,
                 "name" => "",
@@ -78 +101 @@
                 "othercommand" => 0,
                 "roleid" => 0,
-                "displayorder" => 0
+                "displayorder" => 0,
+                "pushrecordid" => "",
+                "type" => 0,
             );
+            
+            return $thereturn;
 
         }//end function getDefaults
@@ -90 +117 @@
                     tableoptions.id,
                     tableoptions.name,
+                    tableoptions.name AS `displayname`,
+                    IF(`tableoptions`.`othercommand`='0','1',IF(`tableoptions`.`name` LIKE '%:%','3','2')) AS `commandtype`,
                     tableoptions.option,
                     tableoptions.othercommand,
+                    tableoptions.othercommand AS `type`,
                     tableoptions.displayorder,
                     tableoptions.roleid,
@@ -109 +139 @@
             $querystatement .= "
                 ORDER BY
-                    tableoptions.othercommand,
+                    `commandtype`,
                     tableoptions.displayorder,
                     tableoptions.name";
 
-            return $this->db->query($querystatement);
+            $queryresult = $this->db->query($querystatement);
+                
+            $thereturn = array();
+            while($therecord = $this->db->fetchArray($queryresult)){
+                
+                $therecord["pushrecordid"] = "";
+                
+                /**
+                  *  Here, we check to see if the 'name' field is a pushrecord
+                  *  uuid. If so, we need to set the pushrecordid.
+                  */
+                if($therecord["commandtype"] == 3){
+                        
+                    $therecord["pushrecordid"] = $therecord["name"];
+                    
+                    /**
+                      *  Need name of the push record 
+                      */                        
+                    $pushquery = "
+                        SELECT
+                            `name`
+                        FROM
+                            `pushrecords`
+                        WHERE
+                            `uuid` = '".$therecord["name"]."'
+                    ";
+
+                    $pushresult = $this->db->query($pushquery);
+                    
+                    if($this->db->numRows($pushresult)){
+                        $pushrecord = $this->db->fetchArray($pushresult);
+                        $therecord["displayname"] = $pushrecord["name"];
+                    }//end if
+                        
+                    $therecord["type"] = 2;
+                    
+                }//end if
+
+                $thereturn[] = $therecord;
+
+            }//end while
+
+            return $thereturn;
+            //return $this->db->query($querystatement);
 
         }//end method
 
 
-        function showRecords($queryresult){
+        /**
+          *  function showRecords
+          *  @param array $recordArray
+          */
+
+        function showRecords($recordArray){
 
             global $phpbms;
@@ -143 +221 @@
                 <tbody>
                     <?php
-                        if($this->db->numRows($queryresult)){
+                        if(count($recordArray)){
 
                             $row = 1;
 
-                            $other = 3;
-
-                            while($therecord = $this->db->fetchArray($queryresult)){
+                            $other = 4;
+
+                            foreach($recordArray as $therecord){
 
                                 $row = ($row == 1) ? 2 : 1;
 
-                                    if($therecord["othercommand"] !== $other){
-
-                                        ?><tr class="queryGroup"><td colspan="7"><?php echo ($therecord["othercommand"] == 1)? "Additional Commands" : "Integrated Features";?></td></tr><?php
-
-                                        $other = $therecord["othercommand"];
+                                    if($therecord["commandtype"] !== $other){
+                                        
+                                        switch($therecord["commandtype"]){
+                                            
+                                            case 1:
+                                                $title = "Integrated Features";
+                                                break;
+                                            
+                                            case 2:
+                                                $title = "Additional Commands";
+                                                break;
+                                            
+                                            case 3:
+                                                $title = "Api Commands";
+                                                break;
+                                            
+                                        }//end if
+
+                                        ?><tr class="queryGroup"><td colspan="7"><?php echo $title;?></td></tr><?php
+
+                                        $other = $therecord["commandtype"];
 
                                     }//end if ?>
@@ -200 +294 @@
 
                                             if($therecord["othercommand"])
-                                                echo formatVariable($therecord["name"]);
+                                                echo formatVariable($therecord["displayname"]);
                                             else
                                                 echo "&nbsp;";
@@ -249 +343 @@
                 $variables["needselect"] = 0;
 
-            if($variables["type"]){
-
-                $name = $variables["acName"];
-                $option = $variables["acOption"];
-
-            } else {
-
-                $name = $variables["ifName"];
-                $option = $variables["ifOption"];
-
-            } //end if
+            switch($variables["type"]){
+
+                case 0:
+                    $name = $variables["ifName"];
+                    $option = $variables["ifOption"];
+                    break;
+
+                case 1:
+                    $name = $variables["acName"];
+                    $option = $variables["acOption"];
+                    break;
+
+                case 2:
+                    $name = $variables["productid"];
+                    $option = $variables["acOption"];
+                    break;
+
+            }//end switch
 
             $insertstatement = "
@@ -296 +397 @@
                 $variables["needselect"] = 0;
 
+            if($variables["type"])
+                $variables["othercommand"] = 1;
+            else
+                $variables["othercommand"] = 0;
+
             $updatestatement = "
                 UPDATE
@@ -302 +408 @@
                     roleid = '".$variables["roleid"]."',
                     displayorder = ".((int) $variables["displayorder"]).",
-                    othercommand = ".((int) $variables["type"]).",
+                    othercommand = ".((int) $variables["othercommand"]).",
                     needselect = ".((int) $variables["needselect"]).",";
 
-            if(!$variables["type"])
-                $updatestatement .= "
-                    name = '".$variables["ifName"]."',
-                    `option` = '".$variables["ifOption"]."'
-                ";
-            else
-                $updatestatement .= "
-                    name = '".$variables["acName"]."',
-                    `option` = '".$variables["acOption"]."'
-                ";
+            switch($variables["type"]){
+
+                case 0:
+                    $updatestatement .= "
+                        name = '".$variables["ifName"]."',
+                        `option` = '".$variables["ifOption"]."'
+                    ";
+                    break;
+
+                case 1:
+                    $updatestatement .= "
+                        name = '".$variables["acName"]."',
+                        `option` = '".$variables["acOption"]."'
+                    ";
+                    break;
+
+                case 2:
+                    $updatestatement .= "
+                        `name` = '".$variables["pushrecordid"]."',
+                        `option` = '".$variables["acOption"]."'
+                    ";
+                    break;
+
+            }//end switch
 
             $updatestatement .= "
@@ -348 +468 @@
 
                 case "edit":
-                    $queryresult = $this->get($variables["id"]);
-                    $therecord = $this->db->fetchArray($queryresult);
+                    $therecord = $this->get($variables["id"]);
+                    $therecord = $therecord[0];
                     break;
 

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

@@ -1 +1 @@
 tableOptions = {
-        
+
         switchType: function(e){
-                
+
                 var type =      getObjectFromID("type");
                 var ifDiv =     getObjectFromID("ifDiv");
                 var acDiv =     getObjectFromID("acDiv");
-                
-                if(type.value == 1){
-                        
-                        ifDiv.style.display = "none";
-                        acDiv.style.display = "block";
-                        
-                } else {
-                        
-                        ifDiv.style.display = "block";
-                        acDiv.style.display = "none";
-                        
-                }//end if                       
-                
+                var acNote = getObjectFromID("acNote");
+                var apiNote = getObjectFromID("apiNote");
+
+                switch(type.value){
+
+                        case "0":
+                                ifDiv.style.display = "block";
+                                acDiv.style.display = "none";
+                                apiNote.style.display = "none";
+                                acNote.style.display = "none";
+                                break;
+
+                        case "1":
+                                ifDiv.style.display = "none";
+                                acDiv.style.display = "block";
+                                apiNote.style.display = "none";
+                                acNote.style.display = "block";
+                                break;
+
+                        case "2":
+                                ifDiv.style.display = "none";
+                                acDiv.style.display = "block";
+                                apiNote.style.display = "block";
+                                acNote.style.display = "none";
+                                break;
+                }
+
         },//end method
-        
-        
+
+
         edit: function(e){
-                
+
                 tableOptions._tableButtonClick(e, "edit")
-                
+
         }, //end method
-        
-        
+
+
         del: function(e){
-        
+
                 tableOptions._tableButtonClick(e, "delete")
 
         },//end method
-        
-        
+
+
         _tableButtonClick: function(e, thecommand){
-                
+
                 var id =                getObjectFromID("id");
                 var command =   getObjectFromID("command");
-                
+
                 var button = e.src();
 
                 var theid = button.id.substr(3);
-                
+
                 id.value = theid;
                 command.value = thecommand;
 
-                tableOptions.submitForm(e); 
+                tableOptions.submitForm(e);
 
         }, //end method
-        
-        
+
+
         submitForm: function(e){
-                                
+
                 var command = getObjectFromID("command");
                 var theform = getObjectFromID("record")
-                
+
                 if(command.value == "add" || command.value == "update"){
 
@@ -67 +81 @@
 
                 }//end if
-                
+
                 theform.submit();
-                
+
         }, //end method
-        
-        
+
+
         cancel: function(e){
 
                 var command =   getObjectFromID("command");
-                
+
                 command.value = "cancel";
 
-                tableOptions.submitForm(e); 
+                tableOptions.submitForm(e);
 
         }//end method
-        
+
 }//end class
 
@@ -88 +102 @@
 /* ------------------------------------------------------- */
 connect(window,"onload",function() {
-        
+
         var type = getObjectFromID("type")
-        connect(type, "onchange", tableOptions.switchType);     
-        
+        connect(type, "onchange", tableOptions.switchType);
+
         var theForm = getObjectFromID("record");
         connect(type, "onsubmit", function(e){e.stop();});
-        
+
         var delButtons = getElementsByClassName("buttonDelete");
         for(var i=0; i < delButtons.length; i++)
-                connect(delButtons[i], "onclick", tableOptions.del);    
-                
+                connect(delButtons[i], "onclick", tableOptions.del);
+
         var editButtons = getElementsByClassName("buttonEdit");
         for(var i=0; i < editButtons.length; i++)
-                connect(editButtons[i], "onclick", tableOptions.edit);  
-        
+                connect(editButtons[i], "onclick", tableOptions.edit);
+
         var cancelButton = getObjectFromID("cancel");
         if(cancelButton)
                 connect(cancelButton, "onclick", tableOptions.cancel);
-                
+
         var saveButton = getObjectFromID("save");
-        connect(saveButton, "onclick", tableOptions.submitForm);                
-        
+        connect(saveButton, "onclick", tableOptions.submitForm);
+
         tableOptions.switchType();
-        
+
 });//end connect

trunk/phpbms/modules/base/scheduler_addedit.php

@@ -54 +54 @@
 
         $phpbms->cssIncludes[] = "pages/scheduler.css";
+        $phpbms->jsIncludes[] = "modules/base/javascript/scheduler.js";
 
                 //Form Elements
                 //==============================================================
                 $theform = new phpbmsForm();
+                $theform->id = $theform->name;
 
                 $theinput = new inputCheckbox("inactive",$therecord["inactive"]);
@@ -66 +68 @@
                 $theform->addField($theinput);
 
-                $theinput = new inputField("job",$therecord["job"],"script",true,NULL,32,128,false);
+                if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){
+                        
+                        $list = array(
+                                "file" => "job",
+                                "push record"=>"pushrecord"
+                        );
+                        $theinput = new inputBasicList("scripttype", $therecord["scripttype"], $list, "script type");
+                        $theform->addField($theinput);
+                        
+                        $theinput = new inputSmartSearch($db, "pushrecordid", "Pick Push Record For Cron", $therecord["pushrecordid"]);
+                        $theform->addField($theinput);
+                
+                }//end if
+                
+                $theinput = new inputField("job",$therecord["job"],"script",false,NULL,32,128,false);
                 $theform->addField($theinput);
-
+                
                 $theinput = new inputDatePicker("startdate",$therecord["startdate"], "start date" ,true, 11, 15, false);
                 $theform->addField($theinput);
 
                 $theinput = new inputTimePicker("starttime",$therecord["starttime"], "start time" ,true,11, 15, false);
-                //$theinput->setAttribute("onchange","checkEndDate();");
                 $theform->addField($theinput);
 
@@ -115 +130 @@
                         <p><?php $theform->showField("name");?></p>
 
-                        <p>
-                                <label for="job">script</label> <span class="notes">(path relative to <?php echo $currentpath?>)</span><br />
-                                <?php $theform->showField("job");?>
+                        <?php if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){ ?>
+                                <p><?php $theform->showField("scripttype"); ?></p>
+                                <p id="pushrecordidp">
+                                                <?php $theform->showField("pushrecordid"); ?>
+                                </p>
+                        <?php }//end if ?>      
+                        <p id="jobp">
+                                        <label for="job">script</label> <span class="notes">(path relative to <?php echo $currentpath?>)</span><br />
+                                        <?php $theform->showField("job");?>
                         </p>
                         <p>

trunk/phpbms/modules/base/smartsearches_addedit.php

@@ -40 +40 @@
         include("include/fields.php");
         include("include/tables.php");
+
 
         $thetable = new phpbmstable($db,"tbld:29925e0a-c825-0067-8882-db4b57866a96");

trunk/phpbms/modules/base/tabledefs_options.php

@@ -70 +70 @@
                         "Additional Commands" => 1,
                 );
-                $theinput = new inputBasicList("type", $therecord["othercommand"], $temparray);
-                $theform->addField($theinput);
-
-                $temparray =array(
+
+
+        if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){
+            $temparray["Api Commands"] = 2;
+
+            $theinput = new inputDataTableList($db, "pushrecordid", $therecord["pushrecordid"], "pushrecords", "pushrecords.uuid",
+                                               "pushrecords.name", "pushrecords.originuuid = '".$options->tabledefuuid."'",
+                                               "pushrecords.name ASC", true, "Push Record Commands");
+            $theform->addField($theinput);
+        }
+
+                $theinput = new inputBasicList("type", $therecord["type"], $temparray);
+                $theform->addField($theinput);
+
+                $temparray = array(
                         "new" => "new",
                         "edit" => "edit",
@@ -157 +168 @@
                         <div id="acDiv">
 
-                                <p class="notes">
-                                        Additional command allows you to add items to the
-                                        other commands drop down on the search screen.
-                                        The PHP method name should refrence a function
-                                        in the tables extended searchFunctions class
-                                        in the [tablename].php located in the modules
-                                        include folder.
-                                </p>
+                                <div id="acNote">
+                    <p class="notes">
+                        Additional command allows you to add items to the
+                        other commands drop down on the search screen.
+                        The PHP method name should refrence a function
+                        in the tables extended searchFunctions class
+                        in the [tablename].php located in the modules
+                        include folder.
+                    </p>
+                    <p><?php $theform->showField("acName") ?></p>
+                </div>
+                <?php if(moduleExists("mod:b2d42220-443b-fe74-dbdb-ed2c0968c38c", $phpbms->modules)){ ?>
+                    <div id="apiNote">
+                        <p class="notes">
+                            API stuff.
+                        </p>
+                        <p><?php $theform->showfield("pushrecordid"); ?></p>
+                    </div>
+                <?php }//end if ?>
 
                                 <p><?php $theform->showField("acOption") ?></p>
-
-                                <p><?php $theform->showField("acName") ?></p>
 
                                 <p><?php $theform->showField("needselect") ?></p>

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

@@ -228 +228 @@
                                 if( $variables["otherphone"] !== NULL && $variables["otherphone"] !== "" && !validatePhone($variables["otherphone"]))
                                         $this->verifyErrors[] = "The `otherphone` field must have a valid phone number (as set in configuration) or must be left blank.";
-
+                        */
                         //check bool on has credit
                         if(isset($variables["hascredit"]))
                                 if($variables["hascredit"] && $variables["hascredit"] != 1)
-                                        $this->verifyErrors[] = "The `hascredit` field must be a boolean (equivalent to 0 or exactly 1).";*/
+                                        $this->verifyErrors[] = "The `hascredit` field must be a boolean (equivalent to 0 or exactly 1).";
 
 

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

@@ -1326 +1326 @@
 function calculateTotal(){
 
-        var thetotalBD=getObjectFromID("totalBD");
-        var subtotal=getObjectFromID("totaltni");
-        var thediscount=getObjectFromID("discountamount");
-        var shipping=getObjectFromID("shipping");
-        var taxpercentage=getObjectFromID("taxpercentage");
-        var tax=getObjectFromID("tax");
-        var totalti=getObjectFromID("totalti");
-        var totaltaxable=getObjectFromID("totaltaxable");
-        var discountFromID=getObjectFromID("discount");
+        var thetotalBD = getObjectFromID("totalBD");
+        var subtotal = getObjectFromID("totaltni");
+        var thediscount = getObjectFromID("discountamount");
+        var shipping = getObjectFromID("shipping");
+        var taxpercentage = getObjectFromID("taxpercentage");
+        var tax = getObjectFromID("tax");
+        var totalti = getObjectFromID("totalti");
+        var totaltaxable = getObjectFromID("totaltaxable");
+        var discountFromID = getObjectFromID("discount");
 
         //calculate and reformat discount
@@ -1343 +1343 @@
                 // compute discount from discount id
                 if(discountFromID.value.indexOf("%")!=-1){
-                        numDiscount=parseFloat(thetotalBD.value)*parseFloat(discountFromID.value.substring(0,discountFromID.value.length-1))/100
+                        numDiscount=parseFloat(thetotalBD.value)*parseFloat(discountFromID.value.substring(0,discountFromID.value.length-1))/100;
                 } else {
                         numDiscount=parseFloat(discountFromID.value);
@@ -1349 +1349 @@
         }
 
-        thediscount.value= numberToCurrency(numDiscount);
+        thediscount.value = numberToCurrency(numDiscount);
 
         //calculate totaltaxable
@@ -1362 +1362 @@
 
         //next calculate and reformat shipping
-        var numshipping=currencyToNumber(shipping.value);
-        shippingValue=numberToCurrency(numshipping);
-        shipping.value=shippingValue;
+        var numshipping = currencyToNumber(shipping.value);
+        shippingValue = numberToCurrency(numshipping);
+        shipping.value = shippingValue;
 
         //next calculate and reformat tax
@@ -1386 +1386 @@
 
         //last calculate and format the grand total
-        var thetotal=numsubtotal+numshipping+numtax;
+        var thetotal = roundForCurrency(numsubtotal + numshipping + numtax);
         thetotal=numberToCurrency(thetotal);
         totalti.value=thetotal;