Navigation

← Previous Changeset
Next Changeset →

Changeset 882

Timestamp:

07/10/08 12:11:16 (2 months ago)

Author:

rach

Message:

add description for the REFILL and PAYMENT for the ADMIN and AGENT

Files:

trunk/admin/Public/A2B_entity_card.php (modified) (4 diffs)
trunk/admin/Public/form_data/FG_var_logrefill.inc (modified) (3 diffs)
trunk/admin/Public/form_data/FG_var_payment.inc (modified) (3 diffs)
trunk/agent/Public/A2B_entity_card.php (modified) (4 diffs)
trunk/agent/Public/form_data/FG_var_logrefill.inc (modified) (3 diffs)
trunk/agent/Public/form_data/FG_var_payment.inc (modified) (2 diffs)
trunk/common/javascript/card.js (modified) (2 diffs)
trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql (modified) (1 diff)
trunk/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.4.0-pgsql.sql (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/admin/Public/A2B_entity_card.php

r777	r882
22	22
23	23	/******************************* BATCH UPDATE *********************************/
24		getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language', 'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate', 'upd_expiredays', 'upd_runservice', 'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber'));
	24	getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language', 'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate', 'upd_expiredays', 'upd_runservice', 'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber','description'));
25	25	// CHECK IF REQUEST OF BATCH UPDATE
26	26	if ($batchupdate == 1 && is_array($check)) {
…	…
97	97	$instance_table -> Update_table ($HD_Form -> DBHandle, $param_update, $FG_EDITION_CLAUSE, $func_table = null);
98	98
99		$field_insert = "date, credit, card_id";
100		$value_insert = "now(), '$addcredit', '$id'";
	99	$field_insert = "date, credit, card_id , description";
	100	$value_insert = "now(), '$addcredit', '$id', '$description' ";
101	101	$instance_sub_table = new Table("cc_logrefill", $field_insert);
102	102	$result_query = $instance_sub_table -> Add_table ($HD_Form -> DBHandle, $value_insert, null, null);
…	…
154	154	<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("REFILL");?> </font></a></center>
155	155	<div class="tohide" style="display:none;">
	156	<form NAME="theForm">
156	157	<table width="90%" border="0" align="center">
157		<tr>~~<form NAME="theForm">~~
	158	<tr>
158	159	<td align="left" width="5%"><img src="<?php echo KICON_PATH; ?>/pipe.gif">
159	160	</td>
…	…
170	171	</table>
171	172	</td>
172		<td class="bgcolor_001" align="center">
173		<input class="form_enter" name="addcredit" size="18" maxlength="6" value="">
174		<input class="form_input_button"
	173	<td class="bgcolor_001" align="center">
	174	<table>
	175	<tr>
	176	<td>
	177	<?php echo gettext("CREDIT :");?>
	178	</td>
	179	<td>
	180	<input class="form_enter" name="addcredit" size="18" maxlength="6" value=""> <?php echo strtoupper($A2B->config['global']['base_currency']); ?>
	181	</td>
	182	</tr>
	183	<tr>
	184	<td>
	185	<?php echo gettext("DESCRIPTION :");?>
	186	</td>
	187	<td>
	188	<textarea class="form_input_textarea" name="description" cols="40" rows="4"></textarea>
	189	</td>
	190	</tr>
	191	<tr>
	192	<td colspan="2" align="center">
	193	<input class="form_input_button"
175	194	TYPE="button" VALUE="<?php echo gettext("ADD CREDIT TO THE SELECTED CARD");?>" onClick="openURL('<?php echo $_SERVER['PHP_SELF']?>?form_action=addcredit&stitle=Card_Refilled&current_page=<?php echo $current_page?>&order=<?php echo $order?>&sens=<?php echo $sens?>&id=')">
176		</td></form>
	195
	196	</td>
	197	</tr>
	198	</table>
	199
	200	</td>
177	201	</tr>
	202
178	203	</table>
	204	</form>
179	205	</div>
180	206	</div>

trunk/admin/Public/form_data/FG_var_logrefill.inc

r715	r882
1	1	<?php
2	2
3		getpost_ifset(array('id', 'card_id', 'date', 'credit'));
	3	getpost_ifset(array('id', 'card_id', 'date', 'credit','description'));
4	4
5	5
…	…
16	16
17	17	$HD_Form -> AddViewElement(gettext("ID"), "cc_logrefill.id", "10%", "center", "sort");
18		$HD_Form -> AddViewElement(gettext("CARD"), "username", "25%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
19		$HD_Form -> AddViewElement(gettext("REFILL DATE"), "date", "30%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
20		$HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "30%", "center", "sort");
	18	$HD_Form -> AddViewElement(gettext("CARD"), "username", "15%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
	19	$HD_Form -> AddViewElement(gettext("REFILL DATE"), "date", "20%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
	20	$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "30%", "center", "sort");
	21	$HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "20%", "center", "sort");
21	22
22		$HD_Form -> FieldViewElement ('cc_logrefill.id, username, date, cc_logrefill.credit ');
	23	$HD_Form -> FieldViewElement ('cc_logrefill.id, username, date,description, cc_logrefill.credit ');
23	24
24	25
…	…
70	71	"" , "", "", "", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
71	72
	73	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
	74	"description",
	75	'',
	76	"TEXTAREA",
	77	"cols=50 rows=4",
	78	"",
	79	gettext("Insert the description"),
	80	"" , "", "", "", "" , "", "", "");
	81
72	82
73
74		$HD_Form -> FieldEditElement ('card_id, date, credit');
	83	$HD_Form -> FieldEditElement ('card_id, date, credit, description');
75	84
76	85

trunk/admin/Public/form_data/FG_var_payment.inc

r715	r882
1	1	<?php
2	2
3		getpost_ifset(array('id', 'card_id', 'date', 'payment'));
	3	getpost_ifset(array('id', 'card_id', 'date', 'payment','description'));
4	4
5	5
…	…
16	16
17	17	$HD_Form -> AddViewElement(gettext("ID"), "cc_logpayment.id", "10%", "center", "sort");
18		$HD_Form -> AddViewElement(gettext("CARD"), "username", "25%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
19		$HD_Form -> AddViewElement(gettext("PAYMENT DATE"), "date", "30%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
20		$HD_Form -> AddViewElement(gettext("PAYMENT AMOUNT"), "payment", "30%", "center", "sort");
	18	$HD_Form -> AddViewElement(gettext("CARD"), "username", "20%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
	19	$HD_Form -> AddViewElement(gettext("PAYMENT DATE"), "date", "20%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
	20	$HD_Form -> AddViewElement(gettext("PAYMENT AMOUNT"), "payment", "10%", "center", "sort");
	21	$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "30%", "center", "sort");
21	22	$HD_Form -> AddViewElement(gettext("REFILL"), "id_logrefill", "20%", "center", "sort", "", "lie_link", "cc_logrefill", "credit, id", "id='%id'", "%1 ".BASE_CURRENCY." (id:%2)", "", "A2B_entity_logrefill.php");
22	23
23		$HD_Form -> FieldViewElement ('cc_logpayment.id, username, date, payment, id_logrefill');
	24	$HD_Form -> FieldViewElement ('cc_logpayment.id, username, date, payment,description ,id_logrefill');
24	25
25	26
…	…
72	73
73	74
	75	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
	76	"description",
	77	'',
	78	"TEXTAREA",
	79	"cols=50 rows=4",
	80	"",
	81	gettext("Insert the description"),
	82	"" , "", "", "", "" , "", "", "");
74	83
75		$HD_Form -> FieldEditElement ('card_id, date, ~~payment~~');
	84	$HD_Form -> FieldEditElement ('card_id, date, description');
76	85
77	86

trunk/agent/Public/A2B_entity_card.php

r839	r882
37	37
38	38	/******************************* BATCH UPDATE *********************************/
39		getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language', 'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate', 'upd_expiredays', 'upd_runservice', 'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber'));
	39	getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language', 'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate', 'upd_expiredays', 'upd_runservice', 'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber','description'));
40	40	// CHECK IF REQUEST OF BATCH UPDATE
41	41	if ($batchupdate == 1 && is_array($check)) {
…	…
133	133	$update_msg ='<b><font color="green">'.gettext("Refill executed ").'</font></b>';
134	134
135		$field_insert = "date, credit, card_id";
136		$value_insert = "now(), '$addcredit', '$id'";
	135	$field_insert = "date, credit, card_id, description";
	136	$value_insert = "now(), '$addcredit', '$id','$description'";
137	137	$instance_sub_table = new Table("cc_logrefill", $field_insert);
138	138	$result_query = $instance_sub_table -> Add_table ($HD_Form -> DBHandle, $value_insert, null, null);
…	…
206	206	<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("REFILL");?> </font></a></center>
207	207	<div class="tohide" style="display:none;">
	208	<form NAME="theForm">
208	209	<table width="90%" border="0" align="center">
209		<tr>~~<form NAME="theForm">~~
	210	<tr>
210	211	<td align="left" width="5%"><img src="<?php echo KICON_PATH; ?>/pipe.gif">
211	212	</td>
…	…
222	223	</table>
223	224	</td>
224		<td class="bgcolor_001" align="center">
225		<input class="form_enter" name="addcredit" size="18" maxlength="6" value="">
226		<input class="form_input_button"
	225	<td class="bgcolor_001" align="center">
	226	<table>
	227	<tr>
	228	<td>
	229	<?php echo gettext("CREDIT :");?>
	230	</td>
	231	<td>
	232	<input class="form_enter" name="addcredit" size="18" maxlength="6" value=""> <?php echo strtoupper($A2B->config['global']['base_currency']); ?>
	233	</td>
	234	</tr>
	235	<tr>
	236	<td>
	237	<?php echo gettext("DESCRIPTION :");?>
	238	</td>
	239	<td>
	240	<textarea class="form_input_textarea" name="description" cols="40" rows="4"></textarea>
	241	</td>
	242	</tr>
	243	<tr>
	244	<td colspan="2" align="center">
	245	<input class="form_input_button"
227	246	TYPE="button" VALUE="<?php echo gettext("ADD CREDIT TO THE SELECTED CARD");?>" onClick="openURL('<?php echo $_SERVER['PHP_SELF']?>?form_action=addcredit&stitle=Card_Refilled&current_page=<?php echo $current_page?>&order=<?php echo $order?>&sens=<?php echo $sens?>&id=')">
228		</td></form>
	247
	248	</td>
	249	</tr>
	250	</table>
	251
	252	</td>
229	253	</tr>
	254
230	255	</table>
	256	</form>
231	257	</div>
232	258	</div>
233
234
235	259	<div class="toggle_hide2show">
236	260	<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("SEARCH CARDS");?> </font></a></center>

trunk/agent/Public/form_data/FG_var_logrefill.inc

r822	r882
1	1	<?php
2	2
3		getpost_ifset(array('id', 'card_id', 'date', 'credit'));
	3	getpost_ifset(array('id', 'card_id', 'date','description', 'credit'));
4	4
5	5
…	…
17	17
18	18	$HD_Form -> AddViewElement(gettext("ID"), "cc_logrefill.id", "10%", "center", "sort");
19		$HD_Form -> AddViewElement(gettext("CARD"), "username", "25%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
20		$HD_Form -> AddViewElement(gettext("REFILL DATE"), "date", "30%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
21		$HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "30%", "center", "sort");
	19	$HD_Form -> AddViewElement(gettext("CARD"), "username", "15%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
	20	$HD_Form -> AddViewElement(gettext("REFILL DATE"), "date", "20%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
	21	$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "30%", "center", "sort");
	22	$HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "20%", "center", "sort");
22	23
23		$HD_Form -> FieldViewElement ('cc_logrefill.id, username, date, cc_logrefill.credit ');
	24	$HD_Form -> FieldViewElement ('cc_logrefill.id, username, date, description ,cc_logrefill.credit ');
24	25
25	26
…	…
72	73
73	74
	75	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
	76	"description",
	77	'',
	78	"TEXTAREA",
	79	"cols=50 rows=4",
	80	"",
	81	gettext("Insert the description"),
	82	"" , "", "", "", "" , "", "", "");
	83
74	84
75		$HD_Form -> FieldEditElement ('card_id, date, credit');
	85	$HD_Form -> FieldEditElement ('card_id, date, credit, description');
76	86
77	87

trunk/agent/Public/form_data/FG_var_payment.inc

r822	r882
16	16	$HD_Form -> FG_TABLE_DEFAULT_SENS = "DESC";
17	17
	18
	19
18	20	$HD_Form -> AddViewElement(gettext("ID"), "cc_logpayment.id", "10%", "center", "sort");
19		$HD_Form -> AddViewElement(gettext("CARD"), "username", "25%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
20		$HD_Form -> AddViewElement(gettext("PAYMENT DATE"), "date", "30%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
21		$HD_Form -> AddViewElement(gettext("PAYMENT AMOUNT"), "payment", "30%", "center", "sort");
	21	$HD_Form -> AddViewElement(gettext("CARD"), "username", "20%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
	22	$HD_Form -> AddViewElement(gettext("PAYMENT DATE"), "date", "20%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
	23	$HD_Form -> AddViewElement(gettext("PAYMENT AMOUNT"), "payment", "10%", "center", "sort");
	24	$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "30%", "center", "sort");
22	25	$HD_Form -> AddViewElement(gettext("REFILL"), "id_logrefill", "20%", "center", "sort", "", "lie_link", "cc_logrefill", "credit, id", "id='%id'", "%1 ".BASE_CURRENCY." (id:%2)", "", "A2B_entity_logrefill.php");
23	26
24		$HD_Form -> FieldViewElement ('cc_logpayment.id, username, date, payment, id_logrefill');
	27	$HD_Form -> FieldViewElement ('cc_logpayment.id, username, date, payment,description ,id_logrefill');
	28
25	29
26	30
…	…
74	78
75	79
76		~~$HD_Form -> FieldEditElement ('card_id, date, payment');~~
77	80
	81	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
	82	"description",
	83	'',
	84	"TEXTAREA",
	85	"cols=50 rows=4",
	86	"",
	87	gettext("Insert the description"),
	88	"" , "", "", "", "" , "", "", "");
78	89
	90	$HD_Form -> FieldEditElement ('card_id, date, description');
79	91
80	92	$HD_Form -> FG_FILTER_APPLY = true;

trunk/common/javascript/card.js

r1	r882
38	38	// get calue of credits
39	39	addcredit = document.theForm.addcredit.value;
	40
	41	description = '';
	42	// get calue of credits
	43	description = document.theForm.description.value;
	44
40	45
41	46	if ( (addcredit == 0) \|\| (!IsNumeric(addcredit)) ){
…	…
45	50
46	51	// redirect browser to the grabbed value (hopefully a URL)
47		self.location.href = theLINK + goURL + "&addcredit="+addcredit;
	52	self.location.href = theLINK + goURL + "&addcredit="+addcredit +"&description="+description;
	53
	54	return false;
48	55
49	56	}

trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql

r877	r882
1006	1006	ALTER TABLE cc_ratecard ADD additional_grace INT NOT NULL DEFAULT '0';
1007	1007
	1008	-- add minimum cost option for a rate card
	1009
1008	1010	ALTER TABLE cc_ratecard ADD minimal_cost FLOAT NOT NULL DEFAULT '0';
	1011
	1012	-- add description for the REFILL AND PAYMENT
	1013	ALTER TABLE cc_logpayment ADD description MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_bin NULL ;
	1014	ALTER TABLE cc_logrefill ADD description MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_bin NULL ;

trunk/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.4.0-pgsql.sql

r877	r882
1003	1003
1004	1004	ALTER TABLE cc_ratecard ADD minimal_cost real NOT NULL DEFAULT 0;
	1005
	1006
	1007	-- add description for the REFILL AND PAYMENT
	1008	ALTER TABLE cc_logpayment ADD description text ;
	1009	ALTER TABLE cc_logrefill ADD description text ;

Navigation

Changeset 882

Legend:

Download in other formats: