Browse Source

updates

feature/styles_review
Dslak 4 years ago
parent
commit
cc35910e3f
  1. 42
      api/order_add.php
  2. 14
      api/send_mail.php
  3. 4
      components/account/account.html
  4. 4
      deploy.sh

42
api/order_add.php

@ -37,25 +37,53 @@ $stmt = $conn->prepare($query);
if($stmt->execute()) {
$order_id = $conn->lastInsertId();
$toEmail = $data->profile->email;
$toName = $data->profile->first_name." ".$data->profile->last_name;
$subject = 'Ordine n. '.$conn->lastInsertId();
$subject = 'Ordine n. '.$order_id;
$body = emailHeader();
$body .= "<tr><td colspan=\"4\" style=\"padding: 10px 20px\">Ciao ".$data->profile->first_name."<br><br>
Siamo contenti che tu abbia acquistato il nostro olio, speriamo sia protagonista di tanti momenti conviviali.<br><br>
Ecco i dati riassuntivi del tuo ordine:<br><br>
<span style=\"color: #92704F\">CODICE IDENTIFICATIVO ORDINE:</span><br>
<b>$order_id</b><br><br>
<span style=\"color: #92704F\">TEMPI DI CONSEGNA:</span><br>
La consegna avverrà in circa xx giorni lavorativi<br><br>
<span style=\"color: #92704F\">INDIRIZZO DI CONSEGNA:</span><br>".
$data->profile->first_name." ".$data->profile->last_name."<br>".
$data->profile->address."<br>".
$data->profile->city." - ".
$data->profile->zip_code." - ".
$data->profile->city."<br>
 Telefono contatto: <br>".
$data->profile->phone."<br><br>
<span style=\"color: #92704F\">PRODOTTI ORDINATI:</span><br>
</td></tr>";
$body .= '<tr style="margin: 0; padding: 10px">
<td style="border-bottom: 1px solid #323232;"></td>
<td style="border-bottom: 1px solid #323232; font-weight: bold">Quantità</td>
<td style="border-bottom: 1px solid #323232;; font-weight: bold">Prezzo</td>
<td style="font-weight: bold">Prodotto</td>
<td style="font-weight: bold">Prezzo</td>
<td style="font-weight: bold">Quantità</td>
<td style="font-weight: bold">Totale</td>
</tr>';
foreach($data->cart as $item) {
$qp = "SELECT * FROM products WHERE id=".$item->pid;
$stmtp = $conn->prepare($qp);
$stmtp->execute();
$p = $stmtp->fetch(PDO::FETCH_ASSOC);
$body .= '<tr style="margin: 0; padding: 10px">
<td style="border-bottom: 1px solid #323232; padding: 20px"><img alt="iolovolio" src="http://iolovolio.com/images/products/'.$item->pid.'.png" height="100"></td>
<td style="border-bottom: 1px solid #323232;">'.$item->qty.' </td>
<td style="border-bottom: 1px solid #323232;">'.money_format('%.2n', $item->price).' </td>
<td style="border-bottom: 1px solid #323232;">'.$p['type'].' - '.$p['name'].' </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>
<td style="border-bottom: 1px solid #323232; width: 90px">'.money_format('%.2n', $item->price * $item->qty).' </td>
</tr>';
}
$body .= "<tr><td colspan=\"4\"><br>Ci auguriamo che non ci siano problemi con i prodotti acquistati. In caso contrario puoi effettuare un reso in base a quanto previsto dalle nostre politiche di reso, consultabili cliccando su questo link<br><br>
Grazie,<br>Servizio Clienti Iolovolio<br><br></td></tr>";
$body .= emailFooter();
$sent = sendEmail($toEmail, $toName, $subject, $body);

14
api/send_mail.php

@ -47,31 +47,31 @@ function emailHeader() {
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>IoLovOlio</title>
</head>
<body style="background: #fff; color: #323232; font-family: Arial, Helvetica, sans-serif; font-weight: 400; margin: 0; overflow-x: hidden;">
<body style="background: #F5F2F0; color: #323232; font-family: Arial, Helvetica, sans-serif; font-weight: 400; margin: 0; overflow-x: hidden;">
<!--[if mso]>
<table align="center" border="0" cellpadding="0" cellspacing="0" width="600"><tr><td>
<![endif]-->
<table align="center" border="0" cellpadding="0" cellspacing="0" class="component-header" style="max-width: 600px; margin: 0 auto; width: 100%;">
<table align="center" border="0" cellpadding="0" cellspacing="0" style="max-width: 600px; margin: 0 auto; width: 100%; background: #FFF; border-top: 5px solid #92704F";">
<tr style="margin: 0; padding: 0;">
<td style="height: 80px; margin: 0; padding: 15px; text-align: center;">
<img alt="IoLovOlio" src="http://iolovolio.com/images/logoHeader.png" width="200">
</td>
</tr>
</table>
<div style="margin: 0 auto; max-width: 600px; overflow-x: hidden; width: 100%;">
<table align="center" border="0" cellpadding="10" cellspacing="0" class="component-header" style="background: #F3F3F3; margin: 0 auto; width: 100%;">';
<table align="center" border="0" cellpadding="10" cellspacing="0" style="max-width: 600px; margin: 0 auto; width: 100%; background: #FFF; border-bottom: 5px solid #92704F; color: #000; font-size: 16px">';
}
function emailFooter() {
return '</table><table align="center" border="0" cellpadding="0" cellspacing="15" class="component-footer" style="color: #323232; font-size: 12px; margin: 0 auto; padding: 20px 0; text-align: center; width: 100%;">
return '</table><table align="center" border="0" cellpadding="0" cellspacing="15" style="color: #323232; font-size: 12px; margin: 0 auto; padding: 10px 0; text-align: center; width: 100%;">
<tr style="margin: 0; padding: 0;">
<td style="margin: 0; padding: 0;">
© IoLovOlio<br>
<span style="color: #323232; font-size: 12px; padding: 5px 15px">© IoLovOlio</span>
<a style="color: #323232; font-size: 12px; padding: 5px 15px" href="#">Privacy Policy</a>
<a style="color: #323232; font-size: 12px; padding: 5px 15px" href="#">Termini del servizio</a>
</td>
</tr>
</table>
</div>
<!--[if mso]></td></tr></table><![endif]-->
</body>
</html>';

4
components/account/account.html

@ -185,7 +185,7 @@
<div class="row no-gutters order-row" data-id="order_<?= $r['id'];?>">
<div class="col-3 col-md-2"><?= $r['id'];?></div>
<div class="col-3 col-md-2"><?= conv_date($r['date']);?></div>
<div class="col-3 col-md-3">&euro; <?= money_format('%.2n', $r['total']);?></div>
<div class="col-3 col-md-3"><?= money_format('%.2n', $r['total']);?></div>
<div class="col-3 col-md-2"><?= conv_status($r['status']);?></div>
<div class="col-3 col-md-3 ml-auto text-md-right toggle">
<span class="open">Vedi dettagli</span>
@ -203,7 +203,7 @@
<div class="row no-gutters detail-row">
<div class="col-12">Prodotto: <?= $p['type'].' - '.$p['name'];?></div>
<div class="col-12">Quantità: <?= $item->qty;?></div>
<div class="col-12">Prezzo: &euro; <?= money_format('%.2n', $item->price);?></div>
<div class="col-12">Prezzo: <?= money_format('%.2n', $item->price);?></div>
</div>
<?php
}

4
deploy.sh

@ -14,6 +14,6 @@ do
done
cd ..
rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/admin/.htaccess' --exclude '/api' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
rsync -avz --delete --exclude '/config.php' --exclude '/vendor' -e "ssh -i ./auth/marketmind.pem" ./api/* ubuntu@18.194.83.82:/var/www/iolovolio.com/api/
rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/admin/.htaccess' --exclude '/api' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@35.158.100.246:/var/www/iolovolio.com/
rsync -avz --delete --exclude '/config.php' --exclude '/vendor' -e "ssh -i ./auth/marketmind.pem" ./api/* ubuntu@35.158.100.246:/var/www/iolovolio.com/api/

Loading…
Cancel
Save