muadzmi02
/
allo
forked from SwissLink/allo
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

undo dealer-fasten realease

ifah
Siti Hajar Ibrahim 5 years ago
parent
fb56a3181b
commit
8525c5200f
6 changed files with 2377 additions and 2473 deletions
Unified View Show Diff Stats
  1. 1237
    1244
      app/Http/Controllers/DS/DealerController.php
  2. 1131
    1092
      app/Http/Controllers/DS/MarketingController.php
  3. 0
    46
      resources/views/market/add_dealer.blade.php
  4. 3
    1
      resources/views/market/claim_list.blade.php
  5. 0
    46
      resources/views/market/edit_dealer.blade.php
  6. 6
    44
      resources/views/pdf/agent-claim.blade.php

+ 1237
- 1244
app/Http/Controllers/DS/DealerController.php
File diff suppressed because it is too large
View File


+ 1131
- 1092
app/Http/Controllers/DS/MarketingController.php
File diff suppressed because it is too large
View File


+ 0
- 46
resources/views/market/add_dealer.blade.php View File

<div class="grid2"><label><b>Dealer Name : </b></label></div> <div class="grid2"><label><b>Dealer Name : </b></label></div>
<div class="grid6"><input type="text" name="aname" id="cname" value="" required /></div> <div class="grid6"><input type="text" name="aname" id="cname" value="" required /></div>
<div class="grid2">&nbsp;</div> <div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Business Registration Number: </b></label></div>
<div class="grid6"><input type="text" name="biz_reg_no" id="biz_reg_no" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Contact Number : </b></label></div>
<div class="grid6"><input type="text" name="contact_no" id="contact_no" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Finance Email Address : </b></label></div>
<div class="grid6"><input type="text" name="fin_email" id="fin_email" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div> </div>
<div class="formRow"> <div class="formRow">
<div class="grid2"><label><b>State : </b></label></div> <div class="grid2"><label><b>State : </b></label></div>
<div class="grid6"><input type="text" name="state" id="state" value="" required /></div> <div class="grid6"><input type="text" name="state" id="state" value="" required /></div>
<div class="grid2">&nbsp;</div> <div class="grid2">&nbsp;</div>
</div>

<div class="formRow">
<h6>Bank Account Details</h6>
</div>

<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Bank Name : </b></label></div>
<div class="grid6"><input type="text" name="bank_name" id="bank_name" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div> </div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Account Holder Name : </b></label></div>
<div class="grid6"><input type="text" name="acc_holder_name" id="acc_holder_name" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Account Number : </b></label></div>
<div class="grid6"><input type="text" name="acc_no" id="acc_no" value="" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow noBorderB" id="sendForm"><input type="submit" value="Submit" class="buttonM bPurple formSubmit" name="submit" id="submit"></div> <div class="formRow noBorderB" id="sendForm"><input type="submit" value="Submit" class="buttonM bPurple formSubmit" name="submit" id="submit"></div>
</div> </div>
<div class="widget grid2 widgetH"></div> <div class="widget grid2 widgetH"></div>

+ 3
- 1
resources/views/market/claim_list.blade.php View File



else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null') else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')
{ {
var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null/pdf';
table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null' ).load(); table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null' ).load();
$('#link1').hide();
$('#link1').show();
$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');
} }


else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null') else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')

+ 0
- 46
resources/views/market/edit_dealer.blade.php View File

<div class="grid2"><label><b>Company Name : </b></label></div> <div class="grid2"><label><b>Company Name : </b></label></div>
<div class="grid6"><input type="text" name="aname" id="cname" value="{{$a->name}}" required /></div> <div class="grid6"><input type="text" name="aname" id="cname" value="{{$a->name}}" required /></div>
<div class="grid2">&nbsp;</div> <div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Business Registration Number: </b></label></div>
<div class="grid6"><input type="text" name="biz_reg_no" id="biz_reg_no" value="{{$a->reg_no}}" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Contact Number : </b></label></div>
<div class="grid6"><input type="text" name="contact_no" id="contact_no" value="{{$a->contact}}" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Finance Email Address : </b></label></div>
<div class="grid6"><input type="text" name="fin_email" id="fin_email" value="{{$a->fin_email}}" required /></div>
<div class="grid2">&nbsp;</div>
</div> </div>
<div class="formRow"> <div class="formRow">
<div class="grid2"><label><b>State : </b></label></div> <div class="grid2"><label><b>State : </b></label></div>
<div class="grid6"><input type="text" name="state" id="state" value="{{$a->state}}" required /></div> <div class="grid6"><input type="text" name="state" id="state" value="{{$a->state}}" required /></div>
<div class="grid2">&nbsp;</div> <div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<h6>Bank Account Details</h6>
</div>

<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Bank Name : </b></label></div>
<div class="grid6"><input type="text" name="bank_name" id="bank_name" value="{{$a->bank_name}}" required /></div>
<div class="grid2">&nbsp;</div>
</div> </div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Account Holder Name : </b></label></div>
<div class="grid6"><input type="text" name="acc_holder_name" id="acc_holder_name" value="{{$a->acc_holder_name}}" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Account Number : </b></label></div>
<div class="grid6"><input type="text" name="acc_no" id="acc_no" value="{{$a->acc_no}}" required /></div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow noBorderB" id="sendForm"><input type="submit" value="Update Detail" class="buttonM bPurple formSubmit" name="submit" id="submit"></div> <div class="formRow noBorderB" id="sendForm"><input type="submit" value="Update Detail" class="buttonM bPurple formSubmit" name="submit" id="submit"></div>
</div> </div>
<div class="widget grid2 widgetH"></div> <div class="widget grid2 widgetH"></div>

+ 6
- 44
resources/views/pdf/agent-claim.blade.php View File

<br/> <br/>


<div class="invoice"> <div class="invoice">
<table width="100%" style="font-size: 15px; font-weight:bold">
<tr>
<td style="border: none" >Invoice Number : {{$invoice_no}}</td>
<td style="border: none" align="right">Issue Date: {{ date("d/m/Y H:i:s") }}</td>
</tr>
<tr>
<td style="border: none">Invoice Claim: {{ $month }} / {{ $year}}</td>
<td style="border: none" align="right">Invoice Claim Date Range: 01/{{$month}}/{{$year}} - {{cal_days_in_month(CAL_GREGORIAN,$month,$year)}}/{{$month}}/{{$year}}</td>
</tr>
@if ($project_type!=null)
<tr >
<td colspan="2" style="border: none" >Project Type : {{$project_type}}</td>
</tr>
@endif
</table>
<h3>Invoice Number : {{$invoice_no}}</h3>
<h3>Invoice Claim: {{ $month }} / {{ $year}}</h3>
<h5>Issue Date: {{ date("d/m/Y H:i:s") }}</h5>
<table width="100%" cellpadding="0" cellpadding="0"> <table width="100%" cellpadding="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th>#</th> <th>#</th>
<th>Contract</th> <th>Contract</th>
<th>W/O</th> <th>W/O</th>
<th>D/O</th>
<th>Activation</th> <th>Activation</th>
<th>Name</th> <th>Name</th>
<th>Address</th> <th>Address</th>
<td>{{ $key+1 }}{{ $c['index'] }}</td> <td>{{ $key+1 }}{{ $c['index'] }}</td>
<td>{{ $c['contract'] }}</td> <td>{{ $c['contract'] }}</td>
<td>{{ $c['wo'] }}</td> <td>{{ $c['wo'] }}</td>
<td>{{ $c['do'] }}</td>
<td>{{ $c['activated_dt'] }}</td> <td>{{ $c['activated_dt'] }}</td>
<td>{{ $c['name'] }}</td> <td>{{ $c['name'] }}</td>
<td>{{ $c['address'] }}</td> <td>{{ $c['address'] }}</td>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="10"></td>
<td colspan="9"></td>
<td align="left">Additional Incentives</td> <td align="left">Additional Incentives</td>
<td align="left" class="gray">RM {{ $extra }}</td> <td align="left" class="gray">RM {{ $extra }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="10"></td>
<td colspan="9"></td>
<td align="left">Incentives</td> <td align="left">Incentives</td>
<td align="left" class="gray">RM {{ $basic_total }}</td> <td align="left" class="gray">RM {{ $basic_total }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="10"></td>
<td colspan="9"></td>
<td align="left">Total</td> <td align="left">Total</td>
<td align="left" class="gray">RM {{ $totals }}</td> <td align="left" class="gray">RM {{ $totals }}</td>
</tr> </tr>
<tr>
<td colspan="12" style="border:none"> <p style="color: red" >This is system auto-generated. Payment will be processed within 45 days.</p> </td>
</tr>
</tfoot> </tfoot>
</table> </table>


<table width="100%" style>
<tr>
<td width="50%">Business Registration Number : {{$com->reg_no}} </td>
<td width="50%">Contact Number : {{$com->contact_no}}</td>
</tr>
<tr>
<td colspan="2" style="font-weight: bold ; border:none">Bank Account Details</td>
</tr>
<tr>
<td width="50%">Bank Name : {{$com->bank_name}} </td>
<td width="50%">Account Number : {{$com->acc_no}}</td>
</tr>
<tr>
<td width="50%">Account Holder Name : {{$com->acc_holder_name}}</td>
<td width="50%">Finance Email Address : {{$com->fin_email}}</td>
</tr>
</table>

<table width="100%" cellpadding="0" cellpadding="0" style="margin-top: 80px"> <table width="100%" cellpadding="0" cellpadding="0" style="margin-top: 80px">
<tr> <tr>
<th align="left" width="100%" colspan="3" >------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- <br> *For Internal Use </th>
</tr>
<tr>
<th width="33%">Submitted By</th> <th width="33%">Submitted By</th>
<th width="33%">Verified By</th> <th width="33%">Verified By</th>
<th width="33%">Approved By</th> <th width="33%">Approved By</th>

Write Preview
Loading…
Cancel
Save