Completed
Pull Request — v3.0 (#136)
by
unknown
25:07
created
astpp/application/modules/accounts/views/view_reseller_package_list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 <? startblock('extra_head') ?>
4 4
 <script type="text/javascript" language="javascript">
5 5
     $(document).ready(function() {
6
-        build_grid("cdrs_grid","<?php echo base_url() . "accounts/reseller_details_json/packages/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
6
+        build_grid("cdrs_grid","<?php echo base_url()."accounts/reseller_details_json/packages/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
7 7
         $("#left_panel_quick_search").keyup(function(){
8 8
             quick_search("accounts/customer_details_search/"+'<?php echo $accounttype?>'+"_packages/");
9 9
         });
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
             <div class="col-md-12 no-padding color-three border_box"> 
22 22
                 <div class="pull-left">
23 23
                     <ul class="breadcrumb">
24
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
24
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
25 25
                         <li>
26
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"><?= ucfirst($accounttype); ?> Profile </a>
26
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"><?= ucfirst($accounttype); ?> Profile </a>
27 27
                         </li>
28 28
                         <li class="active">
29
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_packages/" . $edit_id . "/"; ?>">
29
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_packages/".$edit_id."/"; ?>">
30 30
                                 Packages
31 31
                             </a>
32 32
                         </li>
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
                 <div class="pull-right">
36 36
                     <ul class="breadcrumb">
37 37
 		      <li class="active pull-right">
38
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
38
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
39 39
                     </ul>
40 40
                 </div>
41 41
             </div>
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_accounting_taxes_add.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -54,30 +54,30 @@
 block discarded – undo
54 54
                     <div style="float:left; width:275px; margin-left:6px;">
55 55
                         <li>
56 56
                             <?php
57
-                            $i = 1;
57
+							$i = 1;
58 58
                             
59
-                            if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
60
-                                echo "<table>";
61
-                                foreach ($taxesList as $values) {
62
-                                    if ($i == 1)
63
-                                        echo"<tr>";
64
-                                    ?>
59
+							if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
60
+								echo "<table>";
61
+								foreach ($taxesList as $values) {
62
+									if ($i == 1)
63
+										echo"<tr>";
64
+									?>
65 65
                                 <td style="padding-left: 10px;">
66 66
                                     <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) {
67
-                                echo "checked";
68
-                            } ?>/> <?= $values->taxes_description; ?></label><br />        
67
+								echo "checked";
68
+							} ?>/> <?= $values->taxes_description; ?></label><br />        
69 69
                                 </td>
70 70
                                 <?php
71
-                                if ($i % 3 == 0) {
72
-                                    echo"</tr>";
73
-                                    $i = 1;
74
-                                } else {
75
-                                    $i++;
76
-                                }
77
-                            }
78
-                            echo "</table>";
79
-                        }
80
-                        ?>
71
+								if ($i % 3 == 0) {
72
+									echo"</tr>";
73
+									$i = 1;
74
+								} else {
75
+									$i++;
76
+								}
77
+							}
78
+							echo "</table>";
79
+						}
80
+						?>
81 81
                         </li>
82 82
                     </div>
83 83
                 </fieldset>
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,9 @@
 block discarded – undo
59 59
                             if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
60 60
                                 echo "<table>";
61 61
                                 foreach ($taxesList as $values) {
62
-                                    if ($i == 1)
63
-                                        echo"<tr>";
62
+                                    if ($i == 1) {
63
+                                                                            echo"<tr>";
64
+                                    }
64 65
                                     ?>
65 66
                                 <td style="padding-left: 10px;">
66 67
                                     <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) {
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_email_history.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 <? startblock('extra_head') ?>
4 4
 <script type="text/javascript" language="javascript">
5 5
     $(document).ready(function() {
6
-        build_grid("emailhistory_grid","<?php echo base_url() . "accounts/customer_details_json/emailhistory/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
6
+        build_grid("emailhistory_grid","<?php echo base_url()."accounts/customer_details_json/emailhistory/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
7 7
     });
8 8
 
9 9
 </script>
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
             <div class="col-md-12 no-padding color-three border_box"> 
19 19
                 <div class="pull-left">
20 20
                     <ul class="breadcrumb">
21
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s </a></li>
21
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s </a></li>
22 22
                         <li>
23
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
23
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
24 24
                         </li>
25 25
                         <li class="active">
26
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_emailhistory/" . $edit_id . "/"; ?>">
26
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_emailhistory/".$edit_id."/"; ?>">
27 27
                                 Emails
28 28
                             </a>
29 29
                         </li>
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
                 <div class="pull-right">
33 33
                     <ul class="breadcrumb">
34 34
 		      <li class="active pull-right">
35
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
35
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
36 36
                     </ul>
37 37
                 </div>
38 38
             </div>     
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_animap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/validate.js"></script>
5 5
 <script type="text/javascript" language="javascript">
6 6
     $(document).ready(function() {
7
-        build_grid("animap_list","<?php echo base_url() . "accounts/customer_animap_json/$edit_id/$accounttype/"; ?>",<? echo $grid_fields; ?>,"");
7
+        build_grid("animap_list","<?php echo base_url()."accounts/customer_animap_json/$edit_id/$accounttype/"; ?>",<? echo $grid_fields; ?>,"");
8 8
         $('#ani_map').validate({
9 9
             rules: {
10 10
                 number: {
@@ -46,19 +46,19 @@  discard block
 block discarded – undo
46 46
             <div class="col-md-12 no-padding color-three border_box"> 
47 47
                 <div class="pull-left">
48 48
                     <ul class="breadcrumb">
49
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
49
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
50 50
                         <li>
51
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile</a>
51
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile</a>
52 52
                         </li>
53 53
                         <li class="active">
54
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_animap/" . $edit_id . "/"; ?>"> Caller ID</a>
54
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_animap/".$edit_id."/"; ?>"> Caller ID</a>
55 55
                         </li>
56 56
                     </ul>
57 57
                 </div>
58 58
                 <div class="pull-right">
59 59
                     <ul class="breadcrumb">
60 60
 		      <li class="active pull-right">
61
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
61
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
62 62
                     </ul>
63 63
                 </div>
64 64
             </div>
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_accounts_create.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
    $(".country_id").val(<?=$country_id?>);
46 46
    $(".timezone_id").val(<?=$timezone_id?>);
47 47
    $(".currency_id").val(<?=$currency_id?>);
48
-   <?php if($entity_name != 'admin' && $entity_name !='subadmin'){ ?>
48
+   <?php if ($entity_name != 'admin' && $entity_name != 'subadmin') { ?>
49 49
    document.getElementsByName("sweep_id")[0].selectedIndex = <?=1?>;
50 50
 
51 51
 	 $(".sweep_id").change(function(e){
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 			<div class="w-section inverse no-padding">
86 86
 				<?php echo $form; ?>
87 87
 					<?php
88
-						if(isset($validation_errors) && $validation_errors != ''){ ?>
88
+						if (isset($validation_errors) && $validation_errors != '') { ?>
89 89
 						<script>
90 90
 							var ERR_STR = '<?php echo $validation_errors; ?>';
91 91
 							print_error(ERR_STR);
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_subscriptions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/validate.js"></script>
5 5
 <script type="text/javascript" language="javascript">
6 6
     $(document).ready(function() {
7
-        build_grid("subscription_list","<?php echo base_url() . "accounts/customer_details_json/subscription/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
7
+        build_grid("subscription_list","<?php echo base_url()."accounts/customer_details_json/subscription/$edit_id/"; ?>",<? echo $grid_fields; ?>,"");
8 8
         $("#left_panel_quick_search").keyup(function(){
9 9
             quick_search("accounts/customer_details_search/"+'<?php echo $accounttype?>'+"_subscription/");
10 10
         });
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
             <div class="col-md-12 no-padding color-three border_box"> 
46 46
                 <div class="pull-left">
47 47
                     <ul class="breadcrumb">
48
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
48
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
49 49
                         <li>
50
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
50
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
51 51
                         </li>
52 52
                         <li class="active">
53
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_subscription/" . $edit_id . "/"; ?>">
53
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_subscription/".$edit_id."/"; ?>">
54 54
                                 Subscriptions
55 55
                             </a>
56 56
                         </li>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 <div class="pull-right">
60 60
                     <ul class="breadcrumb">
61 61
 		      <li class="active pull-right">
62
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
62
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
63 63
                     </ul>
64 64
                 </div>
65 65
             </div> 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                 <div class="slice color-three pull-left content_border col-md-12">
78 78
                      <fieldset class="margin-b-20">
79 79
                         <legend>Subscriptions</legend>
80
-                        <form method="post" name="purchase_subscription" id="purchase_subscription" action="<?= base_url() . "accounts/customer_subscription_action/add/" . $edit_id . "/" . $accounttype . "/"; ?>" enctype="multipart/form-data">
80
+                        <form method="post" name="purchase_subscription" id="purchase_subscription" action="<?= base_url()."accounts/customer_subscription_action/add/".$edit_id."/".$accounttype."/"; ?>" enctype="multipart/form-data">
81 81
                             
82 82
                             <div class="col-md-8">
83 83
                                 <label class="col-md-3 no-padding">Subscriptions:</label>
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_opensips_devices.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 <script type="text/javascript" language="javascript">
5 5
     $(document).ready(function() {
6 6
 		$('a[rel*=facebox]').facebox();
7
-        build_grid("opensips_grid","<?php echo base_url() . "accounts/customer_details_json/opensips/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
7
+        build_grid("opensips_grid","<?php echo base_url()."accounts/customer_details_json/opensips/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
8 8
         $('.checkall').click(function () {
9 9
             $('.chkRefNos').attr('checked', this.checked); //if you want to select/deselect checkboxes use this
10 10
         });
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
             <div class="col-md-12 no-padding color-three border_box"> 
26 26
                 <div class="pull-left">
27 27
                     <ul class="breadcrumb">
28
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
28
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
29 29
                         <li>
30
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"><?= ucfirst($accounttype); ?> Profile </a>
30
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"><?= ucfirst($accounttype); ?> Profile </a>
31 31
                         </li>
32 32
                        <li class="active">
33
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_opensips/" . $edit_id . "/"; ?>"> Opensips Devices </a>
33
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_opensips/".$edit_id."/"; ?>"> Opensips Devices </a>
34 34
                         </li>
35 35
                     </ul>
36 36
                 </div>
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             <div class="col-md-12 no-padding">
40 40
                 <div class="pull-left margin-t-10">
41 41
                     <span class="btn btn-line-warning">
42
-                        <a href='<?php echo base_url()."opensips/customer_opensips_add/".$edit_id."/";?>' rel="facebox" title="Add">
42
+                        <a href='<?php echo base_url()."opensips/customer_opensips_add/".$edit_id."/"; ?>' rel="facebox" title="Add">
43 43
                         <i class="fa fa-plus-circle fa-lg"></i> Create
44 44
                         </a>
45 45
                     </span>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/accounts/views/view_ani_map.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             }
33 33
     }
34 34
     $(document).ready(function() {
35
-    build_grid("animap_list","<?php echo base_url(); ?>accounts/customer_animap_list_json/<?=$animap_id;?>",<? echo $grid_fields ?>,<?= $grid_buttons ?>);
35
+    build_grid("animap_list","<?php echo base_url(); ?>accounts/customer_animap_list_json/<?=$animap_id; ?>",<? echo $grid_fields ?>,<?= $grid_buttons ?>);
36 36
         $("#animap").click(function(){
37 37
             var b=document.getElementById('id').value;
38 38
          document.getElementById('error_1').innerHTML="";
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
              $.ajax({
49 49
                 type:'POST',
50
-                url: "<?= base_url()?>accounts/customer_animap_list_action/<?=$animap_id;?>",
50
+                url: "<?= base_url()?>accounts/customer_animap_list_action/<?=$animap_id; ?>",
51 51
                 data:$('#ip_map').serialize(), 
52 52
                 success: function(response) {
53 53
                 document.getElementById('number').value="";
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		<div class="row">
96 96
                 <div class="col-md-12" >
97 97
 			<form method="post" name="ip_map" id="ip_map" action="" enctype="multipart/form-data">
98
-                                <input type="hidden" id="animap_id" name="animap_id" value="<?=$animap_id;?>" />
98
+                                <input type="hidden" id="animap_id" name="animap_id" value="<?=$animap_id; ?>" />
99 99
                                 <input type="hidden" name="id" id='id' value='' />
100 100
                                 <label>ANI<span style="color:red"> *</span>: </label>
101 101
 				<input type="input" name="number" id="number" maxlength="15">
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_customer_cdrs_list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 <? startblock('extra_head') ?>
4 4
 <script type="text/javascript" language="javascript">
5 5
     $(document).ready(function() {
6
-        build_grid("cdrs_grid","<?php echo base_url() . "accounts/customer_details_json/cdrs/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
6
+        build_grid("cdrs_grid","<?php echo base_url()."accounts/customer_details_json/cdrs/$edit_id/"; ?>",<? echo $grid_fields ?>,"");
7 7
         $("#left_panel_quick_search").keyup(function(){
8 8
             quick_search("accounts/customer_details_search/"+'<?php echo $accounttype?>'+"_cdrs/");
9 9
         });
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
             <div class="col-md-12 no-padding color-three border_box"> 
22 22
                 <div class="pull-left">
23 23
                     <ul class="breadcrumb">
24
-                        <li><a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_list/";?>"><?= ucfirst($accounttype); ?>s</a></li>
24
+                        <li><a href="<?= base_url()."accounts/".strtolower($accounttype)."_list/"; ?>"><?= ucfirst($accounttype); ?>s</a></li>
25 25
                         <li>
26
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> Profile </a>
26
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> Profile </a>
27 27
                         </li>
28 28
                         <li class="active">
29
-                            <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_cdrs/" . $edit_id . "/"; ?>">
29
+                            <a href="<?= base_url()."accounts/".strtolower($accounttype)."_cdrs/".$edit_id."/"; ?>">
30 30
                                 CDRs
31 31
                             </a>
32 32
                         </li>
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
                 <div class="pull-right">
36 36
                     <ul class="breadcrumb">
37 37
 		      <li class="active pull-right">
38
-		      <a href="<?= base_url() . "accounts/" . strtolower($accounttype) . "_edit/" . $edit_id . "/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
38
+		      <a href="<?= base_url()."accounts/".strtolower($accounttype)."_edit/".$edit_id."/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
39 39
                     </ul>
40 40
                 </div>
41 41
             </div>
Please login to merge, or discard this patch.