deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

OSB enhancements to date

Browse Source
This commit is contained in:
Deon George
2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/discount/auth.inc.php
View File

@@ -4,7 +4,8 @@
$auth_methods = Array
(
Array ('module' => 'discount', 'method' => 'add_cart_discount'),
Array ('module' => 'discount', 'method' => 'user_search'),
Array ('module' => 'discount', 'method' => 'user_search_show')
);
?>
?>

553
modules/discount/discount.inc.php
View File

@@ -29,33 +29,14 @@
* @subpackage Module:Discount
*/
class discount extends OSB_module {
/**
* array of available discounts
*
* @var array
*/
var $discounts=false;
/**
* the cumulative amount of the current discount
*
* @var float
*/
var $discount_total=0;
/**
* the array of discounts applied to the line_items
*
* @var array
*/
var $discount_arr;
/**
* Array that contains list of discount plugins in the /plugins/discount/ directory to load
*
* @var array
*/
var $plugins=false;
# Array of available discounts
private $discounts = array();
# The cumulative amount of the current discount
private $discount_total = 0;
# The array of discounts applied to the line_items
public $discount_arr = array();
# Array that contains list of discount plugins in the /plugins/discount/ directory to load
private $plugins = array();
/**
* Load a specific discount plugin and validate the results
@@ -64,135 +45,147 @@ class discount extends OSB_module {
* @param string $discount The discount code
* @return bool
*/
function plugin_validate($plugin, $discount) {
$plugin_file = PATH_PLUGINS.'discount/'. $plugin . '.php';
if(is_file($plugin_file)) {
private function plugin_validate($plugin,$code) {
$plugin_file = sprintf('%sdiscount/%s.php',PATH_PLUGINS,$plugin);
if (is_file($plugin_file)) {
include_once($plugin_file);
eval('$plg = new plgn_discount_'. $plugin .';');
if(is_object($plg)) {
if(is_callable(array($plg, 'validate'))) {
$plg->discount = $discount;
return $plg->validate($discount);
}
if (is_object($plg) && is_callable(array($plg,'validate'))) {
$plg->discount = $code;
return $plg->validate($code);
}
}
return false;
}
return false;
}
/**
* Add a discount at the cart/checkout by user/admin
* Add a discount code to our session record, it'll be used/evaluated later to calculate the discounts.
*
* @param array $VAR
* @return bool
* @uses session
*/
function add_cart_discount($VAR) {
public function add_cart_discount($VAR) {
global $C_debug, $C_translate, $smarty;
$db = &DB();
# Validate input
if(empty($VAR["discount"])) {
$C_debug->alert($C_translate->translate('invalid_discount','checkout',''));
if (empty($VAR['discount'])) {
$C_debug->alert(_('The discount code was entered incorrectly or is not valid.'));
return false;
}
$discount_code = $VAR["discount"];
$discount_code = $VAR['discount'];
# Check the supplied discount
$db = &DB();
$rs = $db->Execute(sqlSelect($db,"discount","*","( date_start IS NULL OR date_start=0 OR date_start>".time().") AND date_expire<=".time()." AND name=::$discount_code::"));
if (!$rs || !$rs->RecordCount() || $rs->fields["status"] != '1') {
// local check failed, attempt any discount plugins
$plg=false;
if($this->plugins && is_array($this->plugins)) {
foreach($this->plugins as $plugin){
if($discount_code = $this->plugin_validate($plugin, $discount_code)) {
$plg=true;
break;
}
$check = $this->sql_GetRecords(
array('where'=>sprintf('(date_start IS NULL OR date_start=0 OR date_start>%s) AND date_expire<=%s AND name=::%s::',time(),time(),$discount_code)));
# Local check failed, attempt any discount plugins
if (! $check || count($check)>1 || $check[0]['status'] != '1') {
$plg = false;
foreach ($this->plugins as $plugin) {
if ($discount_code = $this->plugin_validate($plugin,$discount_code)) {
$plg = true;
break;
}
}
// no plugins returned true...
if(!$plg) {
$C_debug->alert($C_translate->translate('invalid_discount','checkout',''));
# No plugins returned true...
if (! $plg) {
$C_debug->alert(_('The discount code was entered incorrectly or is not valid.'));
return false;
}
}
# get existing discounts:
# Get existing discounts:
require_once(PATH_MODULES.'session/session.inc.php');
$seo = new session(SESS);
$arr = array();
$rs = $db->Execute(sqlSelect($db,"session","discounts","id=::".SESS."::"));
if($rs && $rs->RecordCount() && !empty($rs->fields['discounts']) && is_string($rs->fields['discounts']))
$arr=unserialize($rs->fields['discounts']);
# check for duplicates
$do = true;
if(is_array($arr)) {
foreach($arr as $key=>$discount) {
if($discount == $discount_code) {
unset($arr[$key]);
$do = false;
}
}
}
# update session data
if($do) $arr[]=$discount_code;
$rs = $db->Execute(sqlUpdate($db,"session",array('discounts'=> serialize($arr)), "id=::".SESS."::"));
return true;
if (is_string($seo->getRecordAttr('discounts')))
$arr = unserialize($seo->getRecordAttr('discounts'));
# Check for duplicates
if (is_array($arr))
foreach ($arr as $key=>$discount)
if ($discount == $discount_code)
return true;
# Update session data
array_push($arr,$discount_code);
$seo->setRecordAttr('discounts',serialize($arr));
$seo->sql_SaveRecord(true,true);
return true;
}
/**
* Commit current discounts to the database (call after creating an invoice_item record)
*/
function invoice_item($invoice_id,$invoice_item_id,$account_id,$discount_arr=false) {
if($discount_arr && is_array($discount_arr)) $this->discount_arr=$discount_arr;
if(is_array($this->discount_arr)) {
$db=&DB();
foreach($this->discount_arr as $dsc) {
$sql="INSERT INTO ".AGILE_DB_PREFIX."invoice_item_discount SET id=".sqlGenID($db,"invoice_item_discount").", site_id=".DEFAULT_SITE.", invoice_id=$invoice_id, account_id=$account_id, invoice_item_id=$invoice_item_id, discount=".$db->qstr($dsc["discount"]).", amount=".$db->qstr($dsc["amount"]);
$db->Execute($sql);
}
* Commit current discounts to the database (call after creating an invoice_item record)
*/
public function invoice_item($invoice_id,$invoice_item_id,$account_id,$discount_arr=false) {
if ($discount_arr && is_array($discount_arr))
$this->discount_arr = $discount_arr;
if (is_array($this->discount_arr)) {
$db =& DB();
foreach ($this->discount_arr as $dsc)
$db->Execute(sqlInsert($db,'invoice_item_discount',
array('invoice_id'=>$invoice_id,'account_id'=>$account_id,'invoice_item_id'=>$invoice_item_id,'discount'=>$dsc['discount'],'amount'=>$dsc['amount'])));
}
}
/**
* Get the avialable discounts for an account, session, or service
* @param $account
* @param $type 0=initial order, 1=recurring charge
*/
function available_discounts($account, $type=0,$invoice=false) {
// get account specific discounts
if($type) $type = " recurr_status=1 "; else $type = " new_status=1 ";
* Get the avialable discounts for an account, session, or service
*
* @param $account
* @param $type 0=initial order, 1=recurring charge
*/
private function available_discounts($account,$type=0,$invoice=false) {
$db =& DB();
$rs = $db->Execute($sql=sqlSelect($db, 'discount', '*', "avail_account_id = $account AND $type AND status=1"));
if($rs && $rs->RecordCount()) {
while (!$rs->EOF) {
$this->discounts["{$rs->fields['name']}"] = $rs->fields;
$rs->MoveNext();
# Get account specific discounts
if ($type)
$sqltype = 'recurr_status=1';
else
$sqltype = 'new_status=1';
foreach ($this->sql_GetRecords(array('where'=>sprintf('avail_account_id=%s AND status=1 AND %s',$account,$sqltype))) as $record)
$this->discounts[$record['name']] = $record;
# Get session discounts from cart
if ($type == 0) {
$rs = $db->Execute(
sqlSelect('session','discounts',array('where'=>sprintf('(account_id=%s OR id=::%s::) AND discounts!=:::: AND discounts IS NOT NULL',$account,SESS))));
if ($rs && $rs->RecordCount()) {
$arr = unserialize($rs->fields['discounts']);
if (is_array($arr))
foreach ($arr as $discount)
if (! empty($discount))
foreach ($this->sql_GetRecords(array('where'=>sprintf('name=%s AND status=1',$discount))) as $record)
$this->discounts[$record['name']] = $record;
}
}
// get session discounts from cart
if($type==0) {
$rsc = $db->Execute(sqlSelect($db, 'session', 'discounts', "(account_id = $account OR id=::".SESS."::) AND discounts != '' AND discounts IS NOT NULL"));
if($rsc && $rsc->RecordCount()) {
$arr=unserialize($rsc->fields['discounts']);
foreach($arr as $discount) {
if(!empty($discount)) {
$rs = $db->Execute(sqlSelect($db, 'discount', '*', "name=::$discount:: AND status=1"));
if($rs && $rs->RecordCount())
if(empty($this->discounts["{$rs->fields['name']}"])) $this->discounts["{$rs->fields['name']}"] = $rs->fields;
}
}
}
}
// get recurring discounts
if($type==1 && $invoice) {
$rs = $db->Execute(sqlSelect($db,array('invoice_item_discount','discount'),'B.*', "A.invoice_id = $invoice AND A.discount = B.name AND $type AND status=1"));
if($rs && $rs->RecordCount()) {
while (!$rs->EOF) {
if(empty($this->discounts["{$rs->fields['name']}"])) $this->discounts["{$rs->fields['name']}"] = $rs->fields;
# Get recurring discounts
} elseif ($type==1 && $invoice) {
$rs = $db->Execute(
sqlSelect($db,array('invoice_item_discount','discount'),'B.*',sprintf('A.invoice_id=%s AND A.discount=B.name AND status=1 AND %s',$invoice,$sqltype)));
if ($rs && $rs->RecordCount()) {
while (! $rs->EOF) {
$this->discounts[$rs->fields['name']] = $rs->fields;
$rs->MoveNext();
}
}
@@ -200,218 +193,216 @@ class discount extends OSB_module {
}
/**
* Calculate all applicable discounts for the current line item
* @param $type bool 0=initial product, 1=recurring product, 2=initial_domain, 3=recurring domain
* @param $invoice_item_id int The invoice item id for the discount
* @param $product_id int The product ID if type=0,1 or The TLD if type = 2,3
* @param $account_id int The account ID
* @param $invoice_amt float The cumulative invoice amount
* @param $prod_amt float The product price before any discounts
*/
function calc_all_discounts($type=0,$invoice_item_id=false, $product_id, $product_amt, $account_id, $invoice_amt) {
$total_amt=0;
if(is_array($this->discounts)) {
if(!$invoice_item_id) unset($this->discount_arr);
foreach($this->discounts as $discount => $tmp)
{
$amt = $this->calc_item_discount($type,$discount, $product_id, $account_id, $invoice_amt, $product_amt);
if($amt > 0)
{
$this->discount_arr[] = Array ('id' => $invoice_item_id, 'discount' => $discount, 'amount' => $amt );
$total_amt += $amt;
$this->discount_total+=$amt;
}
}
* Calculate all applicable discounts for the current line item
*
* @param $type bool 0=initial product, 1=recurring product, 2=initial_domain, 3=recurring domain
* @param $invoice_item_id int The invoice item id for the discount
* @param $product_id int The product ID if type=0,1 or The TLD if type = 2,3
* @param $account_id int The account ID
* @param $invoice_amt float The cumulative invoice amount
* @param $prod_amt float The product price before any discounts
*/
public function calc_all_discounts($type=0,$pid,$pamt,$aid,$iamt) {
# Populate our discounts
$this->available_discounts($aid,$type,$iamt);
if (! count($this->discounts))
return array();
foreach ($this->discounts as $did => $discount) {
$amt = $this->calc_item_discount($type,$did,$pid,$aid,$iamt,$pamt);
if ($amt > 0)
array_push($this->discount_arr,array('discount'=>$discount['name'],'amount'=>$amt));
}
return $total_amt;
return $this->discount_arr;
}
/**
* Add a manual ad-hoc invoice to the array
*
* @param float $amount The discount amount
* @param string $discount Name of the discount
* @param $invoice_item_id int The invoice item id for the discount
*/
function add_manual_discount($amount, $discount='MISC', $invoice_item_id=false) {
$this->discount_arr[] = Array ('id' => $invoice_item_id, 'discount' => $discount, 'amount' => $amount );
}
* Calculate Recurring Discount
*
* @param $type bool 0=initial product, 1=recurring product, 2=initial_domain, 3=recurring domain
* @param $did string The Discount ID (must be set to $this->discount["$discounts"] containing the fields of the discount)
* @param $pid int The product ID if type=0,1 or The TLD if type = 2,3
* @param $aid int The account ID
* @param $iamt float The cumulative invoice amount
* @param $pamt float The product price before any discounts
*/
private function calc_item_discount($type,$did,$pid,$aid,$iamt,$pamt) {
if (empty($this->discounts[$did]))
return false;
$discount = $this->discounts[$did];
/**
* Calculate Recurring Discount
* @param $type bool 0=initial product, 1=recurring product, 2=initial_domain, 3=recurring domain
* @param $discount string The discount array obj (must be set to $this->discount["$discounts"] containing the fields of the discount)
* @param $product_id int The product ID if type=0,1 or The TLD if type = 2,3
* @param $account_id int The account ID
* @param $invoice_amt float The cumulative invoice amount
* @param $prod_amt float The product price before any discounts
*/
function calc_item_discount($type, $discount, $product_id, $account_id, $invoice_amt, $prod_amt)
{
$this->discount = $this->discounts["$discount"];
if($type == 0 || $type == 2) { // initial
$rate_type = $this->discount["new_type"];
$rate = $this->discount["new_rate"];
$min_cost = $this->discount["new_min_cost"];
$max_usage_amt = $this->discount["new_max_discount"];
} else { // recurr
$rate_type = $this->discount["recurr_type"];
$rate = $this->discount["recurr_rate"];
$min_cost = $this->discount["recurr_min_cost"];
$max_usage_amt = $this->discount["recurr_max_discount"];
if ($type == 0 || $type == 2) {
$rate_type = $discount['new_type'];
$rate = $discount['new_rate'];
$min_cost = $discount['new_min_cost'];
$max_usage_amt = $discount['new_max_discount'];
} else {
$rate_type = $discount['recurr_type'];
$rate = $discount['recurr_rate'];
$min_cost = $discount['recurr_min_cost'];
$max_usage_amt = $discount['recurr_max_discount'];
}
if(empty($this->discounts["$discount"])) return false;
$this->discount = $this->discounts["$discount"];
if ((! empty($discount['date_start']) && $discount['date_start']>time()) ||
(! empty($discount['date_expire']) && $discount['date_expire']<time()) ||
(! empty($min_cost) && $min_cost > $iamt))
return 0;
if (!empty( $this->discount["date_start"] ) && $this->discount["date_start"] > time()) return 0;
if (!empty( $this->discount["date_expire"] ) && $this->discount["date_expire"] < time()) return 0;
if(!empty( $min_cost ) && $min_cost > $invoice_amt) return 0;
if( $this->discount["max_usage_account"] > 0 || $this->discount["max_usage_global"] > 0 )
if(!$this->discount_check_usage($this->discount["max_usage_account"],$this->discount["max_usage_global"], $account_id, $discount))
return 0;
if(!empty( $this->discount["avail_account_id"]) && $this->discount["avail_account_id"] != $account_id) return 0;
if($type==0 || $type==2) {
if(!empty( $this->discount["avail_account_id"]) && $this->discount["avail_account_id"] != $account_id) {
if (($discount['max_usage_account']>0 || $discount['max_usage_global']>0) &&
(! $this->discount_check_usage($discount['max_usage_account'],$discount['max_usage_global'],$aid,$did)))
return 0;
if (! empty($discount['avail_account_id']) && $discount['avail_account_id'] != $aid)
return 0;
if ($type==0 || $type==2) {
if (! empty($discount['avail_account_id']) && $discount['avail_account_id'] != $aid) {
return 0;
} else {
if(!empty( $this->discount["avail_group_id"] )) {
$arr=unserialize($this->discount["avail_group_id"]);
if(is_array($arr) && count($arr) > 0 && !empty($arr[0])) {
$do=false;
if (! empty($discount['avail_group_id'])) {
$arr = unserialize($discount['avail_group_id']);
if (is_array($arr) && count($arr) > 0 && ! empty($arr[0])) {
global $C_auth;
for($i=0; $i<count($arr); $i++) {
if($C_auth->auth_group_by_id($arr[$i])) { $do=true; $i=count($arr); }
$do = false;
for ($i=0; $i<count($arr); $i++) {
if ($C_auth->auth_group_by_id($arr[$i])) {
$do=true;
$i=count($arr);
}
}
if(!$do) return 0;
if (! $do)
return 0;
}
}
}
}
if($type<2 && !empty($product_id) && !empty( $this->discount["avail_product_id"] )) {
$arr=unserialize($this->discount["avail_product_id"]);
if(is_array($arr) && count($arr) > 0 && !empty($arr[0])) {
$do=false;
for($i=0; $i<count($arr); $i++) if($arr[$i] == $product_id) { $do=true; $i=count($arr); }
if(!$do) return 0;
}
if ($type<2 && ! empty($pid) && ! empty($discount['avail_product_id'])) {
$arr = unserialize($discount['avail_product_id']);
if (is_array($arr) && count($arr)>0 && ! in_array($pid,$arr))
return 0;
} elseif ($type>1) {
if(!empty( $this->discount["avail_tld_id"] )) {
$do=false;
$tld = $product_id;
if (! empty($discount['avail_tld_id'])) {
$do = false;
$tld = $pid;
$db = &DB();
$rstld = $db->Execute(sqlSelect($db,"host_tld","id","name=::$tld::"));
if($rstld && $rstld->RecordCount()) {
$tld_id = $rstld->fields["id"];
$arr=unserialize($this->discount["avail_tld_id"]);
if(is_array($arr) && count($arr) > 0 && !empty($arr[0])) {
for($i=0; $i<count($arr); $i++) if($arr[$i] == $tld_id) { $do=true; $i=count($arr); }
if(!$do) return 0;
$tld_id = $rstld->fields['id'];
$arr = unserialize($discount['avail_tld_id']);
if (is_array($arr) && count($arr) > 0 && ! empty($arr[0])) {
for ($i=0; $i<count($arr); $i++)
if ($arr[$i] == $tld_id) {
$do=true;
$i=count($arr);
}
if (! $do)
return 0;
}
}
}
}
if($rate_type=="0") {
$discount_amt = $rate*$prod_amt;
if(!empty($max_usage_amt) && $discount_amt > $max_usage_amt) $discount_amt = $max_usage_amt;
if ($rate_type == '0') {
$discount_amt = $rate*$pamt;
if (! empty($max_usage_amt) && $discount_amt > $max_usage_amt)
$discount_amt = $max_usage_amt;
} else {
$discount_amt = $rate;
}
if(!empty( $max_usage_amt )) {
if ( $discount_amt + $this->discount_total > $max_usage_amt)
$discount_amt = $max_usage_amt - $this->discount_total;
if (! empty($max_usage_amt)) {
if ($discount_amt+$this->discount_total > $max_usage_amt)
$discount_amt = $max_usage_amt-$this->discount_total;
}
$this->discount_total += $discount_amt;
return round($discount_amt,2);
}
/**
* Check discount usage for account/global restrictions
*/
function discount_check_usage($max_acct, $max_global, $account_id, $discount)
{
$db = &DB();
$rs = $db->Execute(sqlSelect($db,"invoice_item_discount","invoice_id,account_id","","","","DISTINCT"));
if($rs && $rs->RecordCount()) {
* Check discount usage for account/global restrictions
*/
private function discount_check_usage($max_acct,$max_global,$account_id,$did) {
if (! isset($this->discounts[$did]))
return 0;
$db = &DB();
$rs = $db->Execute(
sqlSelect('invoice_item_discount','account_id,COUNT(account_id) AS count',
array('where'=>array('discount'=>$this->discounts[$did]['name']),'groupby'=>'account_id')));
if ($rs && $rs->RecordCount()) {
# Check global usage
if(!empty($max_global) && $max_global > 0) if($rs->RecordCount() >= $max_global) return false;
if (! empty($max_global) && $max_global>0 && $rs->RecordCount()>=$max_global)
return false;
# Check usage by this account
if(!empty($max_acct) && $max_acct > 0) {
$i=0;
while(!$rs->EOF) {
if($rs->fields['account_id'] == $account_id) $i++;
if (! empty($max_acct) && $max_acct>0) {
$i = 0;
while (! $rs->EOF) {
if ($rs->fields['account_id'] == $account_id && $rs->fields['count']>=$max_acct)
return false;
$rs->MoveNext();
}
if($i>=$max_acct) return false;
}
}
return true;
}
function user_search($VAR) {
# Lock the user only for his billing_records:
if(!SESS_LOGGED) {
return false;
}
# Lock the account_id
$VAR['discount_avail_account_id'] = SESS_ACCOUNT;
$type = "search";
$this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database;
$db->search($VAR, $this, $type);
}
public function search_show($VAR) {
$db =& DB();
$smart = parent::search_show($VAR);
function user_search_show($VAR) {
# Lock the user only for his billing_records:
if(!SESS_LOGGED) {
return false;
}
$type = "search";
$this->method["$type"] = explode(",", $this->method["$type"]);
$db = new CORE_database;
$db->search_show($VAR, $this, $type);
}
for ($i=0; $i<count($smart); $i++) {
$smart[$i]['savings'] = 0;
$smart[$i]['orders'] = 0;
$smart[$i]['revenue'] = 0;
function search_show($VAR) {
$type = "search";
$this->method["$type"] = explode(",", $this->method["$type"]);
$dbc = new CORE_database;
$smart = $dbc->search_show($VAR, $this, $type);
$db = &DB();
for($i=0; $i<count($smart); $i++)
{
$smart[$i]['savings'] = 0;
$smart[$i]['orders'] = 0;
$smart[$i]['revenue'] = 0;
$rs = $db->Execute($sql=sqlSelect($db,Array("invoice","invoice_item_discount"),"SUM(A.total_amt) as sum","B.invoice_id=A.id AND A.billing_status=1 AND B.discount=::{$smart[$i]['name']}::","","","DISTINCT"));
if($rs && $rs->RecordCount()) $smart[$i]['revenue'] = $rs->fields['sum'];
$rs = $db->Execute(sqlSelect($db, 'invoice_item_discount', 'invoice_id,amount', "discount=::{$smart[$i]['name']}::"));
if($rs && $rs->RecordCount() > 0) {
while(!$rs->EOF) {
$smart[$i]['savings'] += $rs->fields['amount'];
if(empty($invoices[$rs->fields['invoice_id']])) {
$smart[$i]['orders']++;
$invoices[$rs->fields['invoice_id']]=true;
$rs = $db->Execute(sqlSelect(array('invoice','invoice_item_discount'),'SUM(A.total_amt) as sum',
array('where'=>sprintf('B.invoice_id=A.id AND A.billing_status=1 AND B.discount=::%s::',$smart[$i]['name']),'distinct'=>true)));
if ($rs && $rs->RecordCount())
$smart[$i]['revenue'] = $rs->fields['sum'];
$rs = $db->Execute(sqlSelect('invoice_item_discount','invoice_id,amount',array('where'=>sprintf('discount=::%s::',$smart[$i]['name']))));
if ($rs && $rs->RecordCount()>0) {
while (! $rs->EOF) {
$smart[$i]['savings'] += $rs->fields['amount'];
if (empty($invoices[$rs->fields['invoice_id']])) {
$smart[$i]['orders']++;
$invoices[$rs->fields['invoice_id']]=true;
}
$rs->MoveNext();
}
}
}
global $smarty;
$smarty->clear_assign('discount');
$smarty->assign('discount', $smart);
}
$smarty->assign('discount',$smart);
}
}
?>

30
modules/discount/discount_construct.xml
View File

@@ -95,6 +95,7 @@
<type>X2</type>
</avail_tld_id>
<new_status>
<display>New Items</display>
<type>L</type>
</new_status>
<new_type>
@@ -110,6 +111,7 @@
<type>F</type>
</new_min_cost>
<recurr_status>
<display>Recurring Items</display>
<type>L</type>
</recurr_status>
<recurr_type>
@@ -128,11 +130,12 @@
<!-- Methods for this class, and the fields they have access to, if applicable -->
<method>
<add>date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</add>
<update>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</update>
<delete>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</delete>
<view>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</view>
<add>date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</add>
<delete>id</delete>
<search>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</search>
<update>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</update>
<user_search>id</user_search>
<view>id,site_id,date_orig,date_start,date_expire,status,name,notes,max_usage_account,max_usage_global,avail_account_id,avail_product_id,avail_group_id,avail_tld_id,new_status,new_type,new_rate,new_max_discount,new_min_cost,recurr_status,recurr_type,recurr_rate,recurr_max_discount,recurr_min_cost</view>
</method>
<!-- Method triggers -->
@@ -172,5 +175,24 @@
<field>new_type</field>
</new_type>
</search_show>
<user_search_show>
<checkbox>
<field>id</field>
<type>checkbox</type>
<width>25px</width>
</checkbox>
<name>
<field>name</field>
</name>
<status>
<field>status</field>
</status>
<new_status>
<field>new_status</field>
</new_status>
<recurr_status>
<field>recurr_status</field>
</recurr_status>
</user_search_show>
</tpl>
</construct>

4
modules/discount/discount_install.xml
View File

@@ -17,7 +17,7 @@
<!-- SUB Modules to install with this one -->
<sub_modules></sub_modules>
<!-- MODULE Type (core|base), core modules cannot be deleted, unrecognised types are ignored. -->
<type>base</type>
<type></type>
</module_properties>
<!-- Tree Menu & Module Methods to load, they will be assigned the group permissions on install time, as selected by the user. -->
@@ -33,7 +33,7 @@
<notes><![CDATA[Delete records]]></notes>
</delete>
<search>
<dislay>List<display>
<display>List</display>
<menu_display>1</menu_display>
<name>search</name>
<notes><![CDATA[List records]]></notes>