Merge branch 'master' of github.com:maxolasersquad/IS4C into v2.3_dev

maxolasersquad · Nov 15, 2010 · a0d5771 · a0d5771
2 parents 701a695 + 0990554
commit a0d5771
Show file tree

Hide file tree

Showing 570 changed files with 83,829 additions and 111 deletions.
diff --git a/pos/backend/batch/sql.php b/pos/backend/batch/sql.php
@@ -129,6 +129,7 @@ function listBatch($backoffice) {
 					`products`.`specialquantity`=`batchProducts`.`quantity`, */
 					`products`.`start_date`=`batchHeaders`.`start`,
 					`products`.`end_date`=`batchHeaders`.`end`,
+					`products`.`discounttype`=1, 
 					`products`.`modified`=NOW()
 					WHERE 1=1 
 						AND `products`.`upc`=`batchProducts`.`upc` 

diff --git a/pos/backend/define.conf b/pos/backend/define.conf
@@ -28,7 +28,7 @@ $_SESSION["laneUser"] = "is4clane";
 $_SESSION["lanePass"] = "is4clane";
 
 define("LANE01", "10.0.0.201");
-define("LANE02", "");
+define("Pylos", "10.10.10.53");
 define("LANE03", "");
 define("LANE04", "");
 define("LANE05", "");

diff --git a/pos/backend/item/index.php b/pos/backend/item/index.php
@@ -64,6 +64,7 @@
 		$_REQUEST['q']=$_REQUEST['edit_upc'];
 		search(&$backoffice);
 	} else  {
+		// No action needed?
 	}
 
 	$html='<!DOCTYPE HTML>

diff --git a/pos/backend/sync/reload.php b/pos/backend/sync/reload.php
@@ -57,7 +57,7 @@
 
 // TODO - Auto generate lanes from define.conf, for now, hardcode
 	$lanes=array(
-		array('Name'=>'Lane 01', 'IP'=>'10.10.10.115')
+		array('Name'=>'Lane 01', 'IP'=>'10.10.10.53')
 	);
 
 	foreach ($lanes as $lane) {

diff --git a/pos/backend/sync/synchronizeproducts.php b/pos/backend/sync/synchronizeproducts.php
@@ -7,6 +7,7 @@ function make_synchronization_query() {
 			$query='SELECT `synchronizationLog`.`datetime` FROM `is4c_log`.`synchronizationLog` WHERE `synchronizationLog`.`name`=\'products\' AND `synchronizationLog`.`status`=1 ORDER BY `synchronizationLog`.`datetime` DESC LIMIT 1';
 			$result=mysql_query($query, $link);
 
+			// TODO, if unable to find last sync datetime, sync whole table?
 			if ($result && mysql_num_rows($result)==1) {
 				$row=mysql_fetch_array($result);
 

diff --git a/pos/backend/time/api/Swift-4.0.6/CHANGES b/pos/backend/time/api/Swift-4.0.6/CHANGES
@@ -0,0 +1,61 @@
+Changelog for Swift Mailer, since Version 4.x
+---------------------------------------------
+
+09 March 2009: 4.0.0
+--------------------
+
+ * Complete rewrite of Version 3.x with lots of breaking changes at the interface
+   level, but for the best in the long run.
+ * Changed Connections to Transports
+ * Made sending more robust (less error prone)
+ * Simplified Swift_Message interface (removed need for separate RecipientList)
+ * Improved Plugin API (better event management)
+ * Changed all MIME generated content to be full RFC 2822 (and friends) compliant
+
+11 March 2009: 4.0.1
+--------------------
+
+  * Fixed regression with cache clearing logic in setBody(), setEncoder() and
+    setCharset()
+
+13 March 2009: 4.0.2
+--------------------
+
+  * Added addTo(), addCc() etc methods.
+  * Allowed setTo(), setCc() etc to accept a $name parameters.
+  * Patched a bug in MailTransport where failed recipients were not being merged.
+  * Added Swift::VERSION constant
+  * Allowed custom autoloaders to be used
+
+20 March 2009: 4.0.3
+--------------------
+
+  * Fixed Bug where base64 encoded content could exceed 76 chars per line
+  * Allowed Decorator plugin to accept a custom Replacements object
+
+12 August 2009: 4.0.4
+--------------------
+
+  * Bugfixes for operating under safe mode and using the MailTransport
+  * Compatibility for PHP 5.3
+  * Optimizations for addTo(), addCc() etc operations
+  * Bugfix for double-escaping issue in batch sending
+
+27 September 2009: 4.0.5
+------------------------
+
+  * Fixed a warning (#78)
+  * Clarified license and updated the file headers accordingly
+  * Added __toString() methods where toString() methods already exists
+  * Removed constants (SWIFT_LIB_DIRECTORY, SWIFT_MAP_DIRECTORY, SWIFT_CLASS_DIRECTORY)
+  * Simplified autoloading
+  * Added a setAuthMode() method to AuthHandler (#54)
+
+20 January 2010: 4.0.6
+----------------------
+
+  * added a PEAR package and a script to generate PEAR packages
+  * fixed Swift_Transport_TransportException for SMTP connection not thrown (#109)
+  * fixed Message-IDs are not updated properly (#118)
+
+-- End of Changes --
diff --git a/pos/backend/time/api/Swift-4.0.6/LICENSE b/pos/backend/time/api/Swift-4.0.6/LICENSE
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/pos/backend/time/api/Swift-4.0.6/README b/pos/backend/time/api/Swift-4.0.6/README
@@ -0,0 +1,30 @@
+Swift Mailer, by Chris Corbyn
+-----------------------------
+
+Swift Mailer is a component based mailing solution for PHP 5.
+It is released under the LGPL license.
+
+Homepage:      http://swiftmailer.org
+Documentation: http://swiftmailer.org/docs
+Mailing List:  http://groups.google.com/group/swiftmailer
+Bugs:          http://swiftmailer.lighthouseapp.com/
+Repository:    http://github.com/swiftmailer/swiftmailer
+
+Swift Mailer is highly object-oriented by design and lends itself
+to use in complex web application with a great deal of flexibility.
+
+For full details on usage, see the documentation.
+
+IMPORTANT: Users upgrading from version 3.x or earlier absolutely
+           MUST read the documentation.  In short, the API is considerably
+           different so your old code won't "just work".
+
+If you'd like to make a donation, we are working on a system where
+donations are taken on a per-feature-request basis via the website
+with target amounts for each feature. In the meantime however you
+may donate directly to the author via PayPal:
+
+  PayPal: chris@w3style.co.uk
+
+Donations are certainly voluntary, but seriously, you donors are
+complete legends and drive this project! :)
diff --git a/pos/backend/time/api/Swift-4.0.6/VERSION b/pos/backend/time/api/Swift-4.0.6/VERSION
@@ -0,0 +1 @@
+Swift-4.0.6
diff --git a/pos/backend/time/api/Swift-4.0.6/lib/classes/Swift.php b/pos/backend/time/api/Swift-4.0.6/lib/classes/Swift.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * General utility class in Swift Mailer, not to be instantiated.
+ * 
+ * @package Swift
+ * 
+ * @author Chris Corbyn
+ */
+abstract class Swift
+{
+
+  /** Swift Mailer Version number generated during dist release process */
+  const VERSION = '4.0.6';
+
+  /**
+   * Internal autoloader for spl_autoload_register().
+   * 
+   * @param string $class
+   */
+  public static function autoload($class)
+  {
+    //Don't interfere with other autoloaders
+    if (0 !== strpos($class, 'Swift'))
+    {
+      return false;
+    }
+
+    $path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php';
+
+    if (!file_exists($path))
+    {
+      return false;
+    }
+
+    require_once $path;
+  }
+
+  /**
+   * Configure autoloading using Swift Mailer.
+   * 
+   * This is designed to play nicely with other autoloaders.
+   */
+  public static function registerAutoload()
+  {
+    spl_autoload_register(array('Swift', 'autoload'));
+  }
+
+}