Skip to content

Commit

Permalink
Merge pull request #368 from ladybirdweb/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
Ashutosh pathak authored Jun 22, 2018
2 parents 3ae6ce3 + 1d2519f commit 80c2a20
Show file tree
Hide file tree
Showing 10 changed files with 397 additions and 299 deletions.
4 changes: 2 additions & 2 deletions app/Http/Controllers/Auth/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,13 @@ public function requestOtpFromAjax(Request $request)
$newEmail = $request->newemail;
$number = $request->oldnumber;
$newNumber = $request->newnumber;
User::where('email', $email)->orwhere('mobile', $number)->update(['email'=>$newEmail, 'mobile'=>$newNumber]);
User::where('email', $email)->update(['email'=>$newEmail, 'mobile'=>$newNumber]);

try {
$code = $request->input('code');
$mobile = $request->input('mobile');
$userid = $request->input('id');
$email = $request->input('newemail');
$email = $request->input('email');
$pass = $request->input('password');
$number = $code.$mobile;

Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Common/MailChimpController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public function addSubscriber($email)

return $result;
} catch (Exception $ex) {
dd($ex);
$exe = json_decode($ex->getMessage(), true);
if ($exe['status'] == 400) {
throw new Exception("$email is already subscribed to newsletter", 400);
Expand Down
47 changes: 22 additions & 25 deletions app/Http/Controllers/Common/TemplateController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,23 +291,23 @@ public function mailing($from, $to, $data, $subject, $replace = [], $type = '',

// // // Set the mailer

// $fields = $settings;
// $driver = '';
// $port = '';
// $host = '';
// $enc = '';
// $email = '';
// $mail_password = '';
// $name = '';
// if ($fields) {
// $driver = $fields->driver;
// $port = $fields->port;
// $host = $fields->host;
// $enc = $fields->encryption;
// $email = $fields->email;
// $mail_password = $fields->password;
// $name = $fields->company;
// }
$fields = $settings;
$driver = '';
$port = '';
$host = '';
$enc = '';
$email = '';
$mail_password = '';
$name = '';
if ($fields) {
$driver = $fields->driver;
$port = $fields->port;
$host = $fields->host;
$enc = $fields->encryption;
$email = $fields->email;
$mail_password = $fields->password;
$name = $fields->company;
}

$https['ssl']['verify_peer'] = false;
$https['ssl']['verify_peer_name'] = false;
Expand All @@ -318,8 +318,8 @@ public function mailing($from, $to, $data, $subject, $replace = [], $type = '',
$transport->setStreamOptions($https);
$set = new \Swift_Mailer($transport);

// // // Set the mailer
// \Mail::setSwiftMailer($set);
// // Set the mailer
\Mail::setSwiftMailer($set);

/*Mail config ends*/

Expand All @@ -346,7 +346,6 @@ public function mailing($from, $to, $data, $subject, $replace = [], $type = '',
return 'success';
} catch (\Exception $ex) {
dd($ex);

Bugsnag::notifyException($ex);
if ($ex instanceof \Swift_TransportException) {
throw new \Exception('We can not reach to this email address');
Expand Down Expand Up @@ -508,12 +507,12 @@ public function taxProcess($taxes, $price, $cart, $shop)
try {
$rate = '';
foreach ($taxes as $tax) {
// dd($tax->rate);
if ($tax->compound != 1) {
$rate = $tax->rate;
$rate += $tax->rate;
} else {
$rate = $tax->rate;
}
// dd($rate);

$tax_amount = $this->ifStatement($rate, $price, $cart, $shop, $tax->country, $tax->state);
}
Expand Down Expand Up @@ -743,7 +742,6 @@ public function prices($id)
$months = round($value->days / 30 / 12);
// dd($months);
// $price[$value->id] = $months.' Year at '.$currency.' '.$cost.'/year';

if ($currency == 'INR') {
$price[$value->id] = '₹'.' '.$cost;
} else {
Expand Down Expand Up @@ -782,7 +780,6 @@ public function leastAmount($id)
}
// dd($price);
}

$cost = "$symbol $price";
} else {
$cost = 'Free';
Expand All @@ -797,7 +794,7 @@ public function leastAmount($id)
// }
}

return $price;
return $cost;
}

public function leastAmountService($id)
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/Front/CartController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ public function showCart()
public function checkTax($productid)
{
try {
$tax_attribute = [];
$tax_attribute[0] = ['name' => 'null', 'rate' => 0, 'tax_enable' =>0];
$taxCondition[0] = new \Darryldecode\Cart\CartCondition([
'name' => 'null',
Expand Down
14 changes: 8 additions & 6 deletions resources/views/themes/default1/common/template/shoppingcart.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
</div>
@endif
<div class="row">
<div class="col-md-12">


<h4 style="font-size: 30px;text-align: center;font-weight: bold;margin-left:450px">Helpdesk Pricing</h4>
</div>

</div>
<div class="col-md-12">
<div class="pricing-table princig-table-flat">
Expand All @@ -79,10 +79,10 @@


<div class="row">
<div class="col-md-12">

<!-- <hr class="tall mt-none"> -->
<h4 style="font-size: 30px;text-align: center;font-weight: bold;margin-top: 65px;margin-left:450px"><strong><center>ServiceDesk Pricing</center></strong></h4>
</div>

</div>
<div class="col-md-12">
<div class="pricing-table princig-table-flat">
Expand All @@ -95,10 +95,10 @@
<br/> <br/> <br/> <br/> <br/> <br/>

<div class="row">
<div class="col-md-12">

<!-- <hr class="tall mt-none"> -->
<h4 style="font-size: 30px;text-align: center;font-weight: bold;margin-top:65px;margin-left:450px;"><strong><center>Services Pricing</center></strong></h4>
</div>

</div>
<div class="col-md-12" style="margin-bottom:40px;">
<div class="pricing-table princig-table-flat">
Expand Down Expand Up @@ -129,3 +129,5 @@

@stop



Loading

0 comments on commit 80c2a20

Please sign in to comment.