Completed
Pull Request — v3.0 (#152)
by Samir
11:27
created
application/modules/invoices/views/view_invoice_edit_automatically.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -181,13 +181,13 @@  discard block
 block discarded – undo
181 181
 	        </tr>
182 182
 	<tr>
183 183
 		<td>
184
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
184
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
185 185
 		 </td>
186 186
 	</tr>
187 187
 	<tr>
188 188
 		<td>
189 189
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
190
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
190
+				echo date('Y-m-d', strtotime($payment_due_date));
191 191
 		?></span>
192 192
 		 </td>
193 193
 	</tr>
@@ -218,12 +218,12 @@  discard block
 block discarded – undo
218 218
 	<th >Amount</th>
219 219
 </tr>
220 220
 <?php
221
-$j=1;
221
+$j = 1;
222 222
 
223
- foreach($invoice_total_query as $value){
224
-	   $id=$value['id'];
225
-	   $debit=$value['debit'];
226
-	   $created_date=$value['created_date'];
223
+ foreach ($invoice_total_query as $value) {
224
+	   $id = $value['id'];
225
+	   $debit = $value['debit'];
226
+	   $created_date = $value['created_date'];
227 227
 ?>	
228 228
 <tr>
229 229
 <td width="20" align="center">
Please login to merge, or discard this patch.
astpp/application/modules/invoices/views/view_invoices_list.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -165,15 +165,15 @@
 block discarded – undo
165 165
 		        </div>
166 166
 	<div class="col-md-5"><label style="text-align:left;float:left;" class="col-md-3"><?php echo gettext('Accounts'); ?> </label>
167 167
 			<?php
168
-					if($login_type == -1){
169
-				$where="deleted = '0' AND reseller_id = '0' AND status = '0' AND (type= '0' OR type= '3' OR type= '1')";
170
-				}if($login_type == 1){
171
-				 $where="deleted = '0' AND reseller_id = '$id' AND status = '0' AND (type= '0' OR type= '3' OR type='1')";
168
+					if ($login_type == -1) {
169
+				$where = "deleted = '0' AND reseller_id = '0' AND status = '0' AND (type= '0' OR type= '3' OR type= '1')";
170
+				}if ($login_type == 1) {
171
+				 $where = "deleted = '0' AND reseller_id = '$id' AND status = '0' AND (type= '0' OR type= '3' OR type='1')";
172 172
 				
173 173
 				}
174
-		$account=$this->db_model->build_dropdown_invoices('id,first_name,last_name,number,type', 'accounts', '', $where);?>
174
+		$account = $this->db_model->build_dropdown_invoices('id,first_name,last_name,number,type', 'accounts', '', $where); ?>
175 175
 		    
176
-	   <?php  echo form_dropdown_all('accountid', $account,''); ?>
176
+	   <?php  echo form_dropdown_all('accountid', $account, ''); ?>
177 177
 			</div>
178 178
 	                <div>
179 179
 		        <div><label style="text-align:left;float:left;" class="col-md-1"><?php echo gettext('Notes'); ?>   </label>
Please login to merge, or discard this patch.
astpp/application/modules/invoices/views/view_invoice_edit_manually.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -158,13 +158,13 @@
 block discarded – undo
158 158
 	        </tr>
159 159
 	<tr>
160 160
 		<td>
161
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
161
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
162 162
 		 </td>
163 163
 	</tr>
164 164
 	<tr>
165 165
 		<td>
166 166
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
167
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
167
+				echo date('Y-m-d', strtotime($payment_due_date));
168 168
 		?></span>
169 169
 		 </td>
170 170
 	</tr>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/invoices/views/view_invoiceconf.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
         <div class="w-section inverse no-padding">
15 15
             <?php echo $form; ?>
16 16
             <?php
17
-			if(isset($validation_errors) && $validation_errors != ''){ ?>
17
+			if (isset($validation_errors) && $validation_errors != '') { ?>
18 18
                 <script>
19 19
                 var ERR_STR = '<?php echo $validation_errors; ?>';
20 20
                 print_error(ERR_STR);
Please login to merge, or discard this patch.
astpp/application/modules/invoices/views/view_invoice_payment.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 	        </tr>
101 101
 	<tr>
102 102
 		<td>
103
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
103
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
104 104
 		 </td>
105 105
 	</tr>
106 106
 	<tr>
107 107
 		<td>
108 108
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
109
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
109
+				echo date('Y-m-d', strtotime($payment_due_date));
110 110
 		?></span>
111 111
 		 </td>
112 112
 	</tr>
@@ -140,24 +140,24 @@  discard block
 block discarded – undo
140 140
 	   </th>
141 141
 	 </tr> 
142 142
 	 <?php
143
-$paypal=0;
144
- foreach($invoice_final_query as $value){
143
+$paypal = 0;
144
+ foreach ($invoice_final_query as $value) {
145 145
  
146
-	if($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT')    {
147
-	   $debit=$value['debit'];
148
-	   $credit=$value['credit'];
149
-	   $paypal+=$credit;
150
-	   $created_date=$value['created_date'];
151
-	   $paypalid=$value['item_id'];
152
-	   $outstanding=$amount-$paypal;
153
-	   $amount_visible='0000';
146
+	if ($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT') {
147
+	   $debit = $value['debit'];
148
+	   $credit = $value['credit'];
149
+	   $paypal += $credit;
150
+	   $created_date = $value['created_date'];
151
+	   $paypalid = $value['item_id'];
152
+	   $outstanding = $amount - $paypal;
153
+	   $amount_visible = '0000';
154 154
       
155 155
       
156 156
      
157 157
 ?>	
158 158
  	 <tr style="height:20px;">
159 159
 			 <td><?php echo $value['description']; ?>  </td>
160
-			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency;  ?></div></td>
160
+			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency; ?></div></td>
161 161
 			 <input type="hidden" name="new_amount" value="<?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?>">
162 162
 			 
163 163
 			
@@ -196,18 +196,18 @@  discard block
 block discarded – undo
196 196
 			
197 197
 	 </tr> 
198 198
 	 <?php
199
-$paypal=0;
200
-if($invoice_date){
201
- foreach($invoice_total_query as $value){
199
+$paypal = 0;
200
+if ($invoice_date) {
201
+ foreach ($invoice_total_query as $value) {
202 202
  
203 203
      
204
-	   $debit=$value['debit'];
205
-	   $credit=$value['credit'];
206
-	   $paypal+=$credit;
207
-	   $created_date=$value['created_date'];
208
-	   $paypalid=$value['item_id'];
209
-	   $outstanding=$amount-$paypal;
210
-	   $amount_visible='0000';
204
+	   $debit = $value['debit'];
205
+	   $credit = $value['credit'];
206
+	   $paypal += $credit;
207
+	   $created_date = $value['created_date'];
208
+	   $paypalid = $value['item_id'];
209
+	   $outstanding = $amount - $paypal;
210
+	   $amount_visible = '0000';
211 211
       
212 212
       
213 213
      
Please login to merge, or discard this patch.
web_interface/astpp/cron/cron.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 		unset($argv[1]);
23 23
 //        $argv = array_merge($argv, $config["argv"][$path]);
24 24
 		$argv[0] = $argv[0];
25
-		$argv[1] =$config["argv"][$path];
25
+		$argv[1] = $config["argv"][$path];
26 26
 		$_SERVER['argv'] = $argv;
27 27
 	} else
28 28
 		die('Use: php cron.php controller/method');
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
 ob_start();
42 42
 
43 43
 // 	chdir( dirname( CRON_CI_INDEX ) );
44
-require( CRON_CI_INDEX );           // main CI index.php file
44
+require(CRON_CI_INDEX); // main CI index.php file
45 45
 $output = ob_get_contents();
46 46
 
47 47
 if (CRON_FLUSH_BUFFERS === TRUE)
48
-	while (@ob_end_flush());          // display buffer contents
48
+	while (@ob_end_flush()); // display buffer contents
49 49
 		else
50 50
 	ob_end_clean();
51 51
 
Please login to merge, or discard this patch.
web_interface/astpp/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
  * as this file.
69 69
  *
70 70
  */
71
-	   $assets_path='assets';
71
+	   $assets_path = 'assets';
72 72
 /*
73 73
  *---------------------------------------------------------------
74 74
  * APPLICATION FOLDER NAME
Please login to merge, or discard this patch.
web_interface/astpp/system/core/URI.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,9 +162,9 @@
 block discarded – undo
162 162
 		$str = remove_invisible_characters($str, FALSE);
163 163
 //================ITPL=======================
164 164
   $pos = strpos($str, "_json");
165
- if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
165
+ if ($pos > 0 && ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
166 166
 	   $this->uri_string = str_replace('_json', '', trim($str, '/'));
167
- }else{
167
+ } else {
168 168
 		// If the URI contains only a slash we'll kill it
169 169
 		$this->uri_string = ($str == '/') ? '' : $str;
170 170
 }
Please login to merge, or discard this patch.
web_interface/astpp/system/core/Common.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -254,7 +254,7 @@
 block discarded – undo
254 254
 				}
255 255
 			}
256 256
 		}
257
-		$_config[0] =& $config;
257
+		$_config[0] = & $config;
258 258
 				return $_config[0];
259 259
 
260 260
 	}
Please login to merge, or discard this patch.