Skip to content

A
AfacAdminpanel
Commit 55c25f9b by Ajil
Options

Merge branch 'ajil' into 'master'

Ajil See merge request !3
parents 436020de 20237840
Showing with 6 additions and 5 deletions
admin/application/views/Garage_response/list.php
...@@ -175,9 +175,9 @@ ...@@ -175,9 +175,9 @@
</thead> </thead>
<?php foreach ($prod_list as $r) { ?> <?php foreach ($prod_list as $r) { ?>
<?php if($r->quote_type ='1') { $quote_types = "BASE";} <?php if($r->quote_type =='1') { $quote_types = "BASE";}
if($r->quote_type ='2') { $quote_types = "MEDIUM";} if($r->quote_type =='2') { $quote_types = "MEDIUM";}
if($r->quote_type ='3') { $quote_types = "PREMIUM";} ?> if($r->quote_type =='3') { $quote_types = "PREMIUM";} ?>
<tbody> <tbody>
<tr> <tr>
<td><?= $r->quote_code ?></td> <td><?= $r->quote_code ?></td>
......
admin/application/views/template/mail_template/garage_quotes.php
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<th>Quote Type</th> <th>Quote Type</th>
<th>Labour Cost</th> <th>Labour Cost</th>
<th>Parts Cost</th> <th>Parts Cost</th>
<th>Margin</th> <th>VAT(%)</th>
<th>Total</th> <th>Total</th>
</tr> </tr>
</thead> </thead>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<td><?= $quoteType ?></td> <td><?= $quoteType ?></td>
<td><?= $value['labour_cost'] ?></td> <td><?= $value['labour_cost'] ?></td>
<td><?= $value['parts_cost'] ?></td> <td><?= $value['parts_cost'] ?></td>
<td><?= $value['margin'] ?></td> <td><?= $value['vat'] ?></td>
<td><?= $value['total'] ?></td> <td><?= $value['total'] ?></td>
<tr> <tr>
</tbody> </tbody>
......
garage/application/models/Garage_request_model.php
...@@ -215,6 +215,7 @@ $ttotal=$total_cost+$amtvat; ...@@ -215,6 +215,7 @@ $ttotal=$total_cost+$amtvat;
'parts_cost'=>$parts_cost[$i], 'parts_cost'=>$parts_cost[$i],
'quote_type'=>$quote_type[$i], 'quote_type'=>$quote_type[$i],
'garage_id'=>$garage_id, 'garage_id'=>$garage_id,
'vat'=>$vat,
'total'=>$ttotal, 'total'=>$ttotal,
'quote_code'=>random_string('allo',5), 'quote_code'=>random_string('allo',5),
'req_id'=>$req_id, 'req_id'=>$req_id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment