diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index b050d2bb1c..32903f2b18 100755 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -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; diff --git a/app/Http/Controllers/Common/MailChimpController.php b/app/Http/Controllers/Common/MailChimpController.php index 134d9c0dec..4bdf1ccc2e 100644 --- a/app/Http/Controllers/Common/MailChimpController.php +++ b/app/Http/Controllers/Common/MailChimpController.php @@ -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); diff --git a/app/Http/Controllers/Common/TemplateController.php b/app/Http/Controllers/Common/TemplateController.php index c994e86b8e..792df198ba 100755 --- a/app/Http/Controllers/Common/TemplateController.php +++ b/app/Http/Controllers/Common/TemplateController.php @@ -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; @@ -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*/ @@ -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'); @@ -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); } @@ -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 { @@ -782,7 +780,6 @@ public function leastAmount($id) } // dd($price); } - $cost = "$symbol $price"; } else { $cost = 'Free'; @@ -797,7 +794,7 @@ public function leastAmount($id) // } } - return $price; + return $cost; } public function leastAmountService($id) diff --git a/app/Http/Controllers/Front/CartController.php b/app/Http/Controllers/Front/CartController.php index 77191218a0..2c913ecd28 100755 --- a/app/Http/Controllers/Front/CartController.php +++ b/app/Http/Controllers/Front/CartController.php @@ -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', diff --git a/resources/views/themes/default1/common/template/shoppingcart.blade.php b/resources/views/themes/default1/common/template/shoppingcart.blade.php index f0c3b81392..4adfa13106 100644 --- a/resources/views/themes/default1/common/template/shoppingcart.blade.php +++ b/resources/views/themes/default1/common/template/shoppingcart.blade.php @@ -61,10 +61,10 @@ @endif
-
+

Helpdesk Pricing

-
+
@@ -79,10 +79,10 @@
-
+

ServiceDesk Pricing

-
+
@@ -95,10 +95,10 @@





-
+

Services Pricing

-
+
@@ -129,3 +129,5 @@ @stop + + diff --git a/resources/views/themes/default1/front/auth/login-register.blade.php b/resources/views/themes/default1/front/auth/login-register.blade.php index 800621cf6a..cea3111e68 100644 --- a/resources/views/themes/default1/front/auth/login-register.blade.php +++ b/resources/views/themes/default1/front/auth/login-register.blade.php @@ -571,30 +571,99 @@ @stop @section('script') + - + + - $('#verify_email').keyup(function(){ + + + + - - function verifyBySendOtp() { - $('#enterotp').hide(); - if(verify_otp_check()) { - $("#verifyOtp").html("Verifying..."); - var data = { - "mobile": $('#verify_number').val(), - "code" : $('#verify_country_code').val(), - "otp" : $('#oneTimePassword').val(), - 'id' : $('#hidden_user_id').val() - }; - $.ajax({ - url: '{{url('otp/verify')}}', - type: 'GET', - data: data, - success: function (response) { - $('#error2').hide(); - $('#alertMessage2').show(); - var result = '
Well Done! '+response.message+'!.
'; - // $('#alertMessage3').show(); - $('#successMessage2').hide(); - $('#success').html(result); - $("#verifyOtp").html("Verify OTP"); - $('.nav-tabs li a[href="#step1"]').tab('show'); - $('.wizard-inner').css('display','none'); - setTimeout(()=>{ - getLoginTab(); - },0) - }, - error: function (ex) { - var myJSON = JSON.parse(ex.responseText); - var html = '
Whoops! Something went wrong

    '; - $("#verifyOtp").html("Verify OTP"); - for (var key in myJSON) - { - html += '
  • ' + myJSON[key][0] + '
    • ' - } - html += '
'; - $('#alertMessage2').hide(); - $('#error2').show(); - document.getElementById('error2').innerHTML = html; - setTimeout(function(){ - $('#error2').hide(); - }, 5000); - } - }); - } - else - { - return false; - } - } - function resendOTP() { - var data = { - "mobile": $('#verify_number').val(), - "code" : $('#verify_country_code').val(), - }; - $.ajax({ - url: '{{url('resend_otp')}}', - type: 'GET', - data: data, - success: function (response) { - - $('#successMessage2').hide (); - $('#alertMessage3').show(); - $('#error2').hide(); - var result = '
Well Done! '+response.message+'!
'; - $('#alertMessage3').html(result+ "."); - }, - error: function (ex) { - var myJSON = JSON.parse(ex.responseText); - var html = '
Oh Snap! Something went wrong

    '; - for (var key in myJSON) - { - html += '
  • ' + myJSON[key][0] + '
    • ' - } - html += '
'; - $('#alertMessage2').hide(); - $('#error2').show(); - document.getElementById('error2').innerHTML = html; - } - }); - } -