Browse Source

fix save order and email send

bugfix/store_order_error
Dslak 4 years ago
parent
commit
c92fe793a8
  1. 12
      api/order_add.php
  2. 2
      api/send_mail.php
  3. 7
      components/checkout/checkout.js
  4. 2
      components/passwordRecovery/passwordRecovery.html
  5. 7
      components/thankyou/thankyou.html
  6. 4
      components/thankyou/thankyou.scss

12
api/order_add.php

@ -61,11 +61,11 @@ if($stmt->execute()) {
<span style=\"color: #92704F\">PRODOTTI ORDINATI:</span><br>
</td></tr>";
$body .= '<tr style="margin: 0; padding: 10px 20px">
<td style="font-weight: bold">Prodotto</td>
$body .= '<tr>
<td style="font-weight: bold; padding-left: 20px">Prodotto</td>
<td style="font-weight: bold">Prezzo</td>
<td style="font-weight: bold">Quantità</td>
<td style="font-weight: bold">Totale</td>
<td style="font-weight: bold; padding-right: 20px">Totale</td>
</tr>';
foreach($data->cart as $item) {
@ -74,8 +74,8 @@ if($stmt->execute()) {
$stmtp->execute();
$p = $stmtp->fetch(PDO::FETCH_ASSOC);
$body .= '<tr style="margin: 0; padding: 10px 20px">
<td style="border-bottom: 1px solid #323232;"><b style="color: #92704F; font-style: italic">'.$p['name'].'</b><br>
$body .= '<tr>
<td style="border-bottom: 1px solid #323232; padding-left: 20px"><b style="color: #92704F; font-style: italic">'.$p['name'].'</b><br>
<span style="font-size: 10px">'.$p['type'].'</span> </td>
<td style="border-bottom: 1px solid #323232; width: 90px">'.money_format('%.2n', $item->price).' </td>
<td style="border-bottom: 1px solid #323232; width: 90px">'.$item->qty.' </td>
@ -88,7 +88,7 @@ if($stmt->execute()) {
$body .= emailFooter();
$sent = sendEmail($toEmail, $toName, $subject, $body);
$sent = sendEmail($toEmail, $toName, $subject, $body, 'ordini');
if($sent === true) {
http_response_code(200);
echo json_encode(

2
api/send_mail.php

@ -18,7 +18,7 @@ function sendEmail($toEmail, $toName, $subject, $body, $from = 'ordini') {
$mail->SMTPSecure = "ssl";
$mail->Port = 465;
$mail->setFrom($from.'@iolovolio.com', 'IoLovOlio');
$mail->setFrom('ordini@iolovolio.com', 'IoLovOlio');
$mail->addAddress(trim($toEmail), "$toName");
$mail->isHTML(true);

7
components/checkout/checkout.js

@ -187,6 +187,13 @@ $(document).ready( () => {
onApprove: (data, actions) => {
return actions.order.capture().then( (details) => {
console.log('Transaction completed by ', details, `${ENV.PP_RETURN}?token=${data.orderID}`)
sessionStorage.setItem('order', JSON.stringify({
profile: profile,
cartItems: cartItems,
token: data.orderID,
uid: uid,
amount: amount
}))
window.location = `${ENV.PP_RETURN}?token=${data.orderID}`
})
}

2
components/passwordRecovery/passwordRecovery.html

@ -8,7 +8,7 @@
$query = "SELECT * FROM `users` WHERE email = '".trim($_POST['reset_usr'])."'";
$q = mysqli_query($conn, $query);
if(mysqli_affected_rows($conn)) {
$new_password = base_convert(date('Y-m-d H:i:s'), 10, 36);
$new_password = base_convert(date('Y-m-d H:i:s'), 10, 36).rand(1,99)."+";
$user = mysqli_fetch_array($q);
$query = "UPDATE `users` SET `password` = '".md5($new_password)."' WHERE id = '".$user['id']."'";

7
components/thankyou/thankyou.html

@ -12,6 +12,13 @@
L'ordine è andato a buon fine. Riceverai un'e-mail all'indirizzo indicato con i dettagli dell'ordine.<br>
<b>Ti ringraziamo per aver acquistato su iolovolio.it</b>
</span>
<?php
if($_SESSION['AUTH']) {
?>
<a href="/account/ordini" class="goto button button-brown mt-4">Vai ai tuoi ordini</a>
<?php
}
?>
</div>
</div>
</div>

4
components/thankyou/thankyou.scss

@ -9,4 +9,8 @@
@include font-style($font-sans, 400, $font-18);
color: $gray;
}
.goto {
display: inline-block;
}
}

Loading…
Cancel
Save