Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop'
Browse files Browse the repository at this point in the history
Conflicts:
	catalog/includes/version.txt
  • Loading branch information
datazen committed Dec 6, 2013
2 parents 1546dbd + 1d804d7 commit a152d53
Show file tree
Hide file tree
Showing 1,062 changed files with 19,459 additions and 22,285 deletions.
18 changes: 7 additions & 11 deletions catalog/account.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?php
/**
* $Id: account.php v1.0 2013-01-01 datazen $
*
* LoadedCommerce, Innovative eCommerce Solutions
* http://www.loadedcommerce.com
*
* Copyright (c) 2013 Loaded Commerce, LLC
*
* @author Loaded Commerce Team
* @copyright (c) 2013 Loaded Commerce Team
* @license http://loadedcommerce.com/license.html
/**
@package catalog
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: account.php v1.0 2013-08-08 datazen $
*/
$_SERVER['SCRIPT_FILENAME'] = __FILE__;

Expand Down
18 changes: 7 additions & 11 deletions catalog/addons/Cash_On_Delivery/controller.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?php
/*
$Id: controller.php v1.0 2013-04-20 datazen $
Loaded Commerce, Innovative eCommerce Solutions
http://www.loadedcommerce.com
Copyright (c) 2013 Loaded Commerce, LLC
@author Loaded Commerce Team
@copyright (c) 2013 LoadedCommerce Team
@license http://loadedcommerce.com/license.html
/**
@package catalog::addons
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: controller.php v1.0 2013-08-08 datazen $
*/
class Cash_On_Delivery extends lC_Addon { // your addon must extend lC_Addon
/*
Expand Down
18 changes: 7 additions & 11 deletions catalog/addons/Cash_On_Delivery/modules/payment/cod.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?php
/**
$Id: cod.php v1.0 2013-01-01 datazen $
Loaded Commerce, Innovative eCommerce Solutions
http://www.loadedcommerce.com
Copyright (c) 2013 Loaded Commerce, LLC
@author Loaded Commerce Team
@copyright (c) 2013 Loaded Commerce Team
@license http://loadedcommerce.com/license.html
/**
@package catalog::addons::payment
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: cod.php v1.0 2013-08-08 datazen $
*/
class lC_Payment_cod extends lC_Payment {
/**
Expand Down
18 changes: 7 additions & 11 deletions catalog/addons/Free_Shipping/controller.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?php
/*
$Id: controller.php v1.0 2013-04-20 datazen $
Loaded Commerce, Innovative eCommerce Solutions
http://www.loadedcommerce.com
Copyright (c) 2013 Loaded Commerce, LLC
@author Loaded Commerce Team
@copyright (c) 2013 LoadedCommerce Team
@license http://loadedcommerce.com/license.html
/**
@package catalog::addons
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: controller.php v1.0 2013-08-08 datazen $
*/
class Free_Shipping extends lC_Addon { // your addon must extend lC_Addon
/*
Expand Down
18 changes: 7 additions & 11 deletions catalog/addons/Free_Shipping/modules/shipping/free.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<?php
/**
$Id: lC_Shipping_free.php v1.0 2013-01-01 datazen $
LoadedCommerce, Innovative eCommerce Solutions
http://www.loadedcommerce.com
Copyright (c) 2013 Loaded Commerce, LLC
@author Loaded Commerce Team
@copyright (c) 2013 Loaded Commerce Team
@license http://loadedcommerce.com/license.html
/**
@package catalog::addons::payment
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: controller.php v1.0 2013-08-08 datazen $
*/
class lC_Shipping_free extends lC_Shipping {

Expand Down
98 changes: 98 additions & 0 deletions catalog/addons/Pro_Pack_595/controller.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php
/**
@package catalog::addons
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: controller.php v1.0 2013-08-08 datazen $
*/
class Pro_Pack_595 extends lC_Addon { // your addon must extend lC_Addon
/*
* Class constructor
*/
public function Pro_Pack_595() {
global $lC_Language;
/**
* The addon type (category)
* valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other
*/
$this->_type = 'pro template pack';
/**
* The addon class name
*/
$this->_code = 'Pro_Pack_595';
/**
* The addon title used in the addons store listing
*/
$this->_title = $lC_Language->get('addon_pro_pack_595_title');
/**
* The addon description used in the addons store listing
*/
$this->_description = $lC_Language->get('addon_pro_pack_595_description');
/**
* The developers name
*/
$this->_author = 'Algozone, Inc.';
/**
* The developers web address
*/
$this->_authorWWW = 'http://www.algozone.com';
/**
* The addon version
*/
$this->_version = '1.0.0';
/**
* The Loaded 7 core compatibility version
*/
$this->_compatibility = '7.0'; // the addon is compatible with this core version and later
/**
* The addon image used in the addons store listing
*/
$this->_thumbnail = '<span onclick="showInfo(\'Pro_Pack_595\',\'LCAZ00595\', \'' . $this->_title . '\');">' . lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/LCAZ00595.png', null, 160, 120) . '</span>';
/**
* The addon enable/disable switch
*/
$this->_enabled = true;

$this->_rating = '5';
}
/**
* Checks to see if the addon has been installed
*
* @access public
* @return boolean
*/
public function isInstalled() {
return (bool)defined('ADDONS_PROPACK_' . strtoupper($this->_code) . '_STATUS');
}
/**
* Install the addon
*
* @access public
* @return void
*/
public function install() {
global $lC_Database;

// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_STATUS', '-1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())");
// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Order Threshold', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_MINIMUM_ORDER', '20', 'The minimum order amount to apply free shipping to.', '6', '0', now())");
// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Shipping Zone', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', '6', '0', 'lc_cfg_use_get_zone_class_title', 'lc_cfg_set_zone_classes_pull_down_menu', now())");
}
/**
* Return the configuration parameter keys an an array
*
* @access public
* @return array
*/
public function getKeys() {
if (!isset($this->_keys)) {
$this->_keys = array('ADDONS_PROPACK_' . strtoupper($this->_code) . '_STATUS',
'ADDONS_PROPACK_' . strtoupper($this->_code) . '_MINIMUM_ORDER',
'ADDONS_PROPACK_' . strtoupper($this->_code) . '_ZONE');
}

return $this->_keys;
}
}
?>
Binary file added catalog/addons/Pro_Pack_595/images/LCAZ00595.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions catalog/addons/Pro_Pack_595/languages/en_US.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<language>
<definitions>
<definition>
<key>addon_pro_pack_595_title</key>
<value><![CDATA[Movie Store Responsive Template]]></value>
<group>general</group>
</definition>
<definition>
<key>addon_pro_pack_595_description</key>
<value><![CDATA[HTML 5.0 Responsive UI]]></value>
<group>general</group>
</definition>
</definitions>
</language>
98 changes: 98 additions & 0 deletions catalog/addons/Pro_Pack_596/controller.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php
/**
@package catalog::addons
@author Loaded Commerce
@copyright Copyright 2003-2014 Loaded Commerce, LLC
@copyright Portions Copyright 2003 osCommerce
@license https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
@version $Id: controller.php v1.0 2013-08-08 datazen $
*/
class Pro_Pack_596 extends lC_Addon { // your addon must extend lC_Addon
/*
* Class constructor
*/
public function Pro_Pack_596() {
global $lC_Language;
/**
* The addon type (category)
* valid types; payment, shipping, themes, checkout, catalog, admin, reports, connectors, other
*/
$this->_type = 'pro template pack';
/**
* The addon class name
*/
$this->_code = 'Pro_Pack_596';
/**
* The addon title used in the addons store listing
*/
$this->_title = $lC_Language->get('addon_pro_pack_596_title');
/**
* The addon description used in the addons store listing
*/
$this->_description = $lC_Language->get('addon_pro_pack_596_description');
/**
* The developers name
*/
$this->_author = 'Algozone, Inc.';
/**
* The developers web address
*/
$this->_authorWWW = 'http://www.algozone.com';
/**
* The addon version
*/
$this->_version = '1.0.0';
/**
* The Loaded 7 core compatibility version
*/
$this->_compatibility = '7.0'; // the addon is compatible with this core version and later
/**
* The addon image used in the addons store listing
*/
$this->_thumbnail = '<span onclick="showInfo(\'Pro_Pack_596\',\'LCAZ00596\', \'' . $this->_title . '\');">' . lc_image(DIR_WS_CATALOG . 'addons/' . $this->_code . '/images/LCAZ00596.png', null, 160, 120) . '</span>';
/**
* The addon enable/disable switch
*/
$this->_enabled = true;

$this->_rating = '5';
}
/**
* Checks to see if the addon has been installed
*
* @access public
* @return boolean
*/
public function isInstalled() {
return (bool)defined('ADDONS_PROPACK_' . strtoupper($this->_code) . '_STATUS');
}
/**
* Install the addon
*
* @access public
* @return void
*/
public function install() {
global $lC_Database;

// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Enable AddOn', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_STATUS', '-1', 'Do you want to enable this addon?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())");
// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Order Threshold', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_MINIMUM_ORDER', '20', 'The minimum order amount to apply free shipping to.', '6', '0', now())");
// $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Shipping Zone', 'ADDONS_PROPACK_" . strtoupper($this->_code) . "_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', '6', '0', 'lc_cfg_use_get_zone_class_title', 'lc_cfg_set_zone_classes_pull_down_menu', now())");
}
/**
* Return the configuration parameter keys an an array
*
* @access public
* @return array
*/
public function getKeys() {
if (!isset($this->_keys)) {
$this->_keys = array('ADDONS_PROPACK_' . strtoupper($this->_code) . '_STATUS',
'ADDONS_PROPACK_' . strtoupper($this->_code) . '_MINIMUM_ORDER',
'ADDONS_PROPACK_' . strtoupper($this->_code) . '_ZONE');
}

return $this->_keys;
}
}
?>
Binary file added catalog/addons/Pro_Pack_596/images/LCAZ00596.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions catalog/addons/Pro_Pack_596/languages/en_US.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<language>
<definitions>
<definition>
<key>addon_pro_pack_596_title</key>
<value><![CDATA[Toy Store Responsive Template]]></value>
<group>general</group>
</definition>
<definition>
<key>addon_pro_pack_596_description</key>
<value><![CDATA[HTML 5.0 Responsive UI]]></value>
<group>general</group>
</definition>
</definitions>
</language>
Loading

0 comments on commit a152d53

Please sign in to comment.