admin orders list

4 years ago · b406b85361
10 changed files with 19 additions and 10 deletions
--- a/.env_prod
+++ b/.env_prod
@ -1,5 +1,5 @@
-API_URL=http://iolovolio.com/api
-SITE_URL=http://iolovolio.com
+API_URL=http://www.iolovolio.com/api
+SITE_URL=http://www.iolovolio.com

 PP_ACCOUNT=dslaky-seller@gmail.com
 PP_CLIENTID=AfnGR9VCjtBF_M0TemwikSG7q0sIm0mE4maIWw9vhiT1-X7vd9ONTvf-D3mEw1AaG9t2CWjoNbHIltI8
--- a/admin/orders.php
+++ b/admin/orders.php
@ -21,7 +21,7 @@
  </div>

  <?php
-    $q = mysqli_query($conn, "SELECT * FROM orders ORDER BY date ASC");
+    $q = mysqli_query($conn, "SELECT * FROM orders ORDER BY date DESC");
    while($r = mysqli_fetch_array($q)) {
  ?>

--- a/api/cart_add.php
+++ b/api/cart_add.php
@ -1,5 +1,6 @@
 <?php
 session_start();
+session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';

--- a/api/cart_del.php
+++ b/api/cart_del.php
@ -1,5 +1,6 @@
 <?php
 session_start();
+session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';

--- a/api/cart_get.php
+++ b/api/cart_get.php
@ -1,5 +1,6 @@
 <?php
 session_start();
+session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';

--- a/api/order_add.php
+++ b/api/order_add.php
@ -1,5 +1,6 @@
 <?php
 session_start();
+session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';

--- a/api/user_add.php
+++ b/api/user_add.php
@ -1,5 +1,6 @@
 <?php
 session_start();
+session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';

--- a/deploy.sh
+++ b/deploy.sh
@ -14,6 +14,6 @@ do
 done
 cd ..

-rsync -avz --delete --exclude '/cgi-bin/conn.conn' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
+rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/api/config.php' -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
 rsync -avz --delete -e "ssh -i ./auth/marketmind.pem" ./admin/* ubuntu@18.194.83.82:/var/www/iolovolio.com/admin/

--- a/pages/index.ejs
+++ b/pages/index.ejs
@ -1,5 +1,4 @@
 <?php
-
  session_start();

  @include 'cgi-bin/conn.conn';
@ -29,6 +28,7 @@
    <meta name="viewport" content="width=device-width, user-scalable=no,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
    <meta name="description" content=".">
    <link rel="stylesheet" href="/assets/css/styles.css">
+    <?= "<script>sessionStorage.setItem('sid','".session_id()."');</script>";?>
  </head>
  <body>

@ -48,5 +48,6 @@
    <div class="loader">
      <img src="/images/logoHeader.png" class="spinner">
    </div>
+
  </body>
 </html>
--- a/src/js/index.js
+++ b/src/js/index.js
@ -36,7 +36,8 @@ window.Spinner = (action = 'show') => {

 window.Apis.addToCart = (pid, price, qty) => {
  return new Promise((resolve, reject) => {
-    $.post(apiUrl + `/cart_add.php?buster=${new Date().getTime()}`, {pid: pid, price: price, qty: qty}).done( (data) => {
+    $.post(apiUrl + `/cart_add.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
+           {pid: pid, price: price, qty: qty}).done( (data) => {
      resolve(data)
    }).fail((error, status) => {
      reject(error)
@ -47,7 +48,8 @@ window.Apis.addToCart = (pid, price, qty) => {

 window.Apis.removeFromCart = (pid) => {
  return new Promise((resolve, reject) => {
-    $.post(apiUrl + `/cart_del.php?buster=${new Date().getTime()}`, {pid: pid}).done( (data) => {
+    $.post(apiUrl + `/cart_del.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
+           {pid: pid}).done( (data) => {
      resolve(data)
    }).fail((error, status) => {
      reject(error)
@ -57,7 +59,8 @@ window.Apis.removeFromCart = (pid) => {

 window.Apis.getCart = (body) => {
  return new Promise((resolve, reject) => {
-    $.post(apiUrl + `/cart_get.php?buster=${new Date().getTime()}`, {body: body}).done( (data) => {
+    $.post(apiUrl + `/cart_get.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
+           {body: body}).done( (data) => {
      resolve(data)
    }).fail((error, status) => {
      reject(error)
@ -70,7 +73,7 @@ window.Apis.addUser = (body) => {
  return new Promise((resolve, reject) => {
    $.ajax({
      type: 'POST',
-      url: apiUrl + `/user_add.php?buster=${new Date().getTime()}`,
+      url: apiUrl + `/user_add.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
      data: JSON.stringify(body),
      dataType: 'json',
      async: true,
@ -151,7 +154,7 @@ window.Apis.saveOrder = (profile, cart, token, uid, total) => {
  return new Promise((resolve, reject) => {
    $.ajax({
      type: 'POST',
-      url: apiUrl + `/order_add.php?buster=${new Date().getTime()}`,
+      url: apiUrl + `/order_add.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
      data: JSON.stringify(body),
      dataType: 'json',
      async: true,