From a398f9243b21897f4e85cf12e44e289e2bb39f54 Mon Sep 17 00:00:00 2001
From: Jacek Pyziak <jacek.pyziak@project-pro.pl>
Date: Fri, 14 Mar 2025 21:10:54 +0100
Subject: [PATCH] =?UTF-8?q?Zmiana=20nazwy=20pola=20email=20w=20zam=C3=B3wi?=
 =?UTF-8?q?eniach=20na=20order=5Femail=20oraz=20usuni=C4=99cie=20pliku=20.?=
 =?UTF-8?q?DS=5FStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/templates/shop-order/view-list.php |  10 +++++-----
 autoload/.DS_Store                       | Bin 0 -> 6148 bytes
 autoload/front/.DS_Store                 | Bin 0 -> 6148 bytes
 templates/.DS_Store                      | Bin 0 -> 6148 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 autoload/.DS_Store
 create mode 100644 autoload/front/.DS_Store
 create mode 100644 templates/.DS_Store

diff --git a/admin/templates/shop-order/view-list.php b/admin/templates/shop-order/view-list.php
index 26035de..e568af9 100644
--- a/admin/templates/shop-order/view-list.php
+++ b/admin/templates/shop-order/view-list.php
@@ -13,7 +13,7 @@ $grid->sql = '
             number,
             date_order,
             CONCAT(client_name, \' \', client_surname) AS client,
-            client_email,
+            client_email AS order_email,
             CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
             status,
             client_phone,
@@ -34,7 +34,7 @@ $grid->sql = '
             client_name IS NOT NULL AND client_surname IS NOT NULL AND client_email IS NOT NULL
         GROUP BY
             client_email
-    ) AS shop_order ON q1.client_email = shop_order.client_email
+    ) AS shop_order ON q1.order_email = shop_order.client_email
     WHERE
         1=1 [where]
     ORDER BY
@@ -49,7 +49,7 @@ $grid->sql_count = '
             number,
             date_order,
             CONCAT(client_name, \' \', client_surname) AS client,
-            client_email,
+            client_email AS order_email,
             CONCAT(client_street, \', \', client_postal_code, \' \', client_city) AS address,
             status,
             client_phone,
@@ -72,7 +72,7 @@ $grid -> search = [
     [ 'name' => 'Status', 'db' => 'status', 'type' => 'select', 'replace' => [ 'array' => \shop\Order::order_statuses() ] ],
     [ 'name' => 'Klient', 'db' => 'client', 'type' => 'text' ],
     [ 'name' => 'Adres', 'db' => 'address', 'type' => 'text' ],
-    // [ 'name' => 'Email', 'db' => 'client_email', 'type' => 'text' ],
+    [ 'name' => 'Email', 'db' => 'order_email', 'type' => 'text' ],
     [ 'name' => 'Telefon', 'db' => 'client_phone', 'type' => 'text' ],
     [ 'name' => 'Dostawa', 'db' => 'transport', 'type' => 'text' ],
     [ 'name' => 'Płatność', 'db' => 'payment_method', 'type' => 'text' ]
@@ -127,7 +127,7 @@ $grid -> columns_view = [
         'db'   => 'address',
     ], [
         'name' => 'Email',
-        'db'   => 'client_email',
+        'db'   => 'order_email',
     ], [
         'name' => 'Telefon',
         'db'   => 'client_phone',
diff --git a/autoload/.DS_Store b/autoload/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3239922a7e1693c4aee135bf32fa7086814704fc
GIT binary patch
literal 6148
zcmeHK%}N6?5T4Nr3%&H{F|W`!h-Lc(1-(iw>Y-~&(R-f8*YM`WC-UYuKZ=V1!Glzp
zf#jQHX7ckbn`DTH7Y~~`(Ts>X6hRiHA=2G69l7%a$U4UT_GZ4iD#NZZ%wcxP+E3`3
z_EhMOTI>I09ZKJ?w`Gl(?&9_F<>~zSY#cw7%{Lyq+dsz8VScw*RWJ|?1Ovgq&l$j-
zEz(U5qYegwfneZ+0XZKMiePrEhI(|M(i8wF&uA6sl1oTTa?Fm^5EckqD9}RLQw+9n
z^e6Yrj@8h@i9PvXpZPs`VVxc0Cv_*zhEWFt!N8b-V{6Xj{$JvkX(svOkZ1)1!N5Ob
zfG7Q`Utm*yw|?24+_eei5=BJ(swfcXqelQ5a*mv;(d<cd_+`gxD5FTfh6CdvpoByf
I4EzEEZwxRjivR!s

literal 0
HcmV?d00001

diff --git a/autoload/front/.DS_Store b/autoload/front/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7285fd13b00a087a6417494eb5c700e132b02819
GIT binary patch
literal 6148
zcmeHKy-veG47N)IK`b2^Z)5Hogep8iC1z;LpVa6o)PmTu@mMgi_iY&Ye72&51c?cu
z%9ecJ#b@8ocTpS@5l^?v3DKB{a;V_w7|nplxM)vCW|2Wob3}Tim(|^5wun7%H~dEi
z<nE5>mab_*8*1HOwQg<qn@1JPa=walc;v6U!`<8E$9aFADlUKFwZ50PrL$T_PxL@H
z^sH~v@K}2f`TN<Y?V*WnuRb(Bux{(X-gO3?0cT*Z89>e!$xjr$bq1UPXP{v~z7GK^
zSQyrd>C=HGl>opD<|OD#Eg><%urRC@F#=%?1!^c;iNP8UdoaJkuvXM?Vk<t_R%WYE
zIIWKPLvklB6uor@oPjO_2l_ac{D1Lt{of7pCuhJJ*eeD&D`({tN3z`7JDlX&0KI~W
oh+nPPgrJjBF?=NzpF)$s9;5>-3~NPLApRqeXz<1v_)`YH0K&6M2mk;8

literal 0
HcmV?d00001

diff --git a/templates/.DS_Store b/templates/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..35bede8d531112e15bff3d5d1313559df4ac3aa3
GIT binary patch
literal 6148
zcmeHKu}%Xq47F*8lju+e1Y>@Hp??sn;|nS=qxK{^^pq2{dv<=R6W_&iY|x#0AXpGW
zwv;?4u^r!&E{TbVmxpFSG$*18O^`(y5t$xcIy2)bkV}jk>gb6QHFOvW^cSZj_ZdCY
z7Fl=H&woSv-Q!}lNp06l{8QUD)%ALp*08N!F0U?*_pi5K#coscBl~W9l1ncwSDgW8
zz!`7`oPlpMfIC~HI#=}G8E^)ife!}cd<bZQ(J(8PqXS(j0f6$1E&^R@3GoSr(J(7w
z1;XkIR9ChVgVi1L!R(@8R#bOlD?ZqEelK3Q?2h=Mm=i}u@0|f>V93BkhjY3A@9@iv
z7WqRLA2|cgz&~Svr}e5{;-l<tJ^4JjYXjN?nuyqCQ6SI<j{pqh9Jwxwx*kM_T{O&!
U5=G{VJJ25jg%IzYfnQ+Y4VU3EkN^Mx

literal 0
HcmV?d00001