From 42984dce650b0988d154498eeff22da40d6ead87 Mon Sep 17 00:00:00 2001 From: feyzullah Demir <101548542+feyzullahdemir@users.noreply.github.com> Date: Tue, 27 Dec 2022 12:20:15 +0300 Subject: [PATCH] update new version --- .DS_Store | Bin 6148 -> 6148 bytes upload/.DS_Store | Bin 6148 -> 6148 bytes upload/admin/.DS_Store | Bin 6148 -> 6148 bytes upload/admin/controller/.DS_Store | Bin 6148 -> 6148 bytes upload/admin/controller/extension/.DS_Store | Bin 6148 -> 6148 bytes .../extension/payment/paywithiyzico.php | 4 +-- upload/admin/language/.DS_Store | Bin 0 -> 6148 bytes upload/admin/language/en-gb/.DS_Store | Bin 0 -> 6148 bytes .../admin/language/en-gb/extension/.DS_Store | Bin 0 -> 6148 bytes upload/admin/language/tr-tr/.DS_Store | Bin 0 -> 6148 bytes .../admin/language/tr-tr/extension/.DS_Store | Bin 0 -> 6148 bytes .../model/extension/payment/paywithiyzico.php | 2 +- upload/admin/view/.DS_Store | Bin 6148 -> 8196 bytes upload/admin/view/image/.DS_Store | Bin 0 -> 6148 bytes upload/admin/view/javascript/.DS_Store | Bin 0 -> 6148 bytes upload/admin/view/stylesheet/.DS_Store | Bin 0 -> 6148 bytes upload/admin/view/template/.DS_Store | Bin 6148 -> 6148 bytes .../admin/view/template/extension/.DS_Store | Bin 6148 -> 6148 bytes upload/catalog/.DS_Store | Bin 6148 -> 6148 bytes upload/catalog/controller/.DS_Store | Bin 6148 -> 6148 bytes upload/catalog/controller/extension/.DS_Store | Bin 6148 -> 6148 bytes .../extension/payment/paywithiyzico.php | 25 ++++++++++++++++-- upload/catalog/language/.DS_Store | Bin 0 -> 6148 bytes upload/catalog/language/en-gb/.DS_Store | Bin 0 -> 6148 bytes .../language/en-gb/extension/.DS_Store | Bin 0 -> 6148 bytes upload/catalog/language/tr-tr/.DS_Store | Bin 0 -> 6148 bytes .../language/tr-tr/extension/.DS_Store | Bin 0 -> 6148 bytes upload/catalog/model/extension/.DS_Store | Bin 6148 -> 6148 bytes upload/catalog/view/.DS_Store | Bin 6148 -> 6148 bytes upload/catalog/view/javascript/.DS_Store | Bin 0 -> 6148 bytes upload/catalog/view/theme/default/.DS_Store | Bin 6148 -> 6148 bytes .../view/theme/default/stylesheet/.DS_Store | Bin 0 -> 6148 bytes .../view/theme/default/template/.DS_Store | Bin 6148 -> 6148 bytes .../default/template/extension/.DS_Store | Bin 6148 -> 6148 bytes .../payment/paywithiyzico_success.twig | 6 ++++- 35 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 upload/admin/language/.DS_Store create mode 100644 upload/admin/language/en-gb/.DS_Store create mode 100644 upload/admin/language/en-gb/extension/.DS_Store create mode 100644 upload/admin/language/tr-tr/.DS_Store create mode 100644 upload/admin/language/tr-tr/extension/.DS_Store create mode 100644 upload/admin/view/image/.DS_Store create mode 100644 upload/admin/view/javascript/.DS_Store create mode 100644 upload/admin/view/stylesheet/.DS_Store create mode 100644 upload/catalog/language/.DS_Store create mode 100644 upload/catalog/language/en-gb/.DS_Store create mode 100644 upload/catalog/language/en-gb/extension/.DS_Store create mode 100644 upload/catalog/language/tr-tr/.DS_Store create mode 100644 upload/catalog/language/tr-tr/extension/.DS_Store create mode 100644 upload/catalog/view/javascript/.DS_Store create mode 100644 upload/catalog/view/theme/default/stylesheet/.DS_Store diff --git a/.DS_Store b/.DS_Store index 78c7b318443c6e6557c37a4329693fda8477afe9..634d9c2dc4428be35e3833a3dc659425d31472db 100644 GIT binary patch delta 119 zcmZoMXfc=|#>B`mu~2NHo+2aD#DLwC4MbQb^D{{>ZlA2dRH!CiU2SfpqhM%YQLCd+ zZE0knqhMleR$I%-A*!rz9TcCPlbe^{Ir#vSJY(19pGB)qu~2NHo+2aj#DLw41(+BanJ4owN;B@5tif2QE>T@=WMrhHU}R)g ztD{hDX=I?IU}9`mTg%BIs;qAv6rY`wo0s1;c|W7PR5t?y0~e;S2p)^7h|m8!A#qGs02 zhWW{z@P(Us**tZ;*$4W%;XLx6`=0+U94!XTqbr_dUYLw#A|MP#=<@M>m;`*`@OcuX zBG#1yX5Fk0nkUO;_q^S*dS{(g%UWJ^v47S(U#;rq@vGCjtQ%?*g!_jUjKU-lgQHBE(E8{$BWu{&zOw}l633p(&MBQozGy`P@s`9f*_5aQG z_kTG^e`y9Z13Se4Gx~1d!IV^O-AImVt%dp-m4y6qi6R6WRgOi6O7RJ*5FE3pgJ>(v TC87mI{}B*0=teW}PZ@Xuc6W`C delta 96 zcmZoMXfc=|#>CJzu~2NHo}vg70|Nsi1A_nqLtaX8a!yiyeh%ZrLXF7=A}o_1vItM^ xW0l`5$|1zEvB89SGdl-A2TFm~3>XIfHU`AmJ)|DaZ9*wd?fU$NlU^Kf9*clC8pMN^*W<&H z+R@9!HoGD3bb^=%7#Fw559`jihudw#KeioR<=4+JCFYOG$3_M;1rDg6-$Z4wxPjXr zHce0p{`-^mR}p+=t|2c3zSXW6w1cVWfQDc_#GM)E!_BFSfxh*NPNfi^))c=v|59)p zEQ(=eA}ot$6d|a2FrSR{_xB|j#nB{fHh;3cee2*_&92!;_8aet&%M-7r<1lnekFRB z_~8VrwjVr?`txq%#v`7jew6gb(jf}_FnRqVNr1XHA4D73JL*)O*IKx}s|3xR$GYl98{woHU)$uxQY)R+V y%H~9_bx_`+2oZLfLg|7^r(@X=srVR03dS7K0J<78h0s9E9|1{&sSE=CJ*u~2NHo+2aj!~knX=E;pL5}YZ;$vH{+`8kY}yI7?re_<2dEXpCo lvavyuc{4i)KL=3HWg_F+we$ljuBbG3;?SY79{`x diff --git a/upload/admin/controller/.DS_Store b/upload/admin/controller/.DS_Store index 8ad4d49d062a54a222f98186423d70516aa1c478..0ccaef040bea738b015ae1b384d0964beb4cb2b2 100644 GIT binary patch delta 227 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk5WA+Ln=cBLkW<~V<=|GWXNa8%Sks3 zPR`FQU;qQBav+68Rc^kEOHxjL5>S={h|jXfA92K`G6knfSyZbFGLWrK*tpS_Z8JLu iKL^n98#jJup3ECJzu~2NHo+2aT!~knX#>s(xkDAt diff --git a/upload/admin/controller/extension/.DS_Store b/upload/admin/controller/extension/.DS_Store index 53b57b6efe2451fe1790f8f507db5ec7af9cac28..28df4a591faae3ac0ac6073ac6c9d0f67ff8f778 100644 GIT binary patch delta 211 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk6b-FLjgk~LnT8lLn=caLrG4$VQ_MO zZUF-rXcYq~G!?n|E-pzq`AI+-4j^`7mp|f&O;rjJstPiAk*#ysxG|7zGdl-A2hgz_ dH-2ZH%rBzL12mk05r`Xrc(ael4(5psECB3PE-(N9 delta 72 zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>qU4a+{AZICG`BOPB$-x)KTi diff --git a/upload/admin/controller/extension/payment/paywithiyzico.php b/upload/admin/controller/extension/payment/paywithiyzico.php index cfa8ef8..b7141e4 100644 --- a/upload/admin/controller/extension/payment/paywithiyzico.php +++ b/upload/admin/controller/extension/payment/paywithiyzico.php @@ -2,8 +2,8 @@ class ControllerExtensionPaymentPaywithiyzico extends Controller { - private $module_version = '1.5'; - private $module_product_name = 'eleven-1.5'; + private $module_version = '1.6'; + private $module_product_name = 'eleven-1.6'; private $error = array(); diff --git a/upload/admin/language/.DS_Store b/upload/admin/language/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e03b3eaefabd5b56423760f578e2cded05f9a026 GIT binary patch literal 6148 zcmeHKyG{c^3>-ruMM{&Ba({q=KUhV{7w`ip1kpr9;?ZA~@8Z)KKZJBTT|q$uW67Rf zpJ!J$#rX`twjakkU;|)9cf`fR)cm>o#I7piXmQ5j`1W`@oX@98?OejSOFZEPw|K^g zzr;IUnP&X)v2)icF9oE46p#W^;NL62p6#|;Cn`z-DIf*D74YvvqdWG(Au&E33^4)_ z7fgq79kT?nd4kvrheT#*mQ-R=twsz>I`ggSdf||mbXeTXbLwWR3B}@e=3A7*dZMBf zkOE@`u5-Kb{=cWs%>QGOc2YnJ{3!)&vAf@G`AXGWCoku{w$UHxUh_$J<2on|(T<7H ij=Ax6d=o`k*L=LhjI`cs%>Sw@pkx7ByR^SV%@)@)M literal 0 HcmV?d00001 diff --git a/upload/admin/language/en-gb/.DS_Store b/upload/admin/language/en-gb/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8ad4d49d062a54a222f98186423d70516aa1c478 GIT binary patch literal 6148 zcmeHKyG{c^3>-s>AexjZ_ZRqsRTRE}A3zX_NKvi`NR(IQyZAK5kAmnzmo(8>vS-)p z+0#vNJ_E4T*X9XW0GQJqar7`XKX;$lU1f|&=N)?-u*HD=<}j%~pK$I2KJblC#y|Y` z-PLtnI`cs%>Sw@pkx7ATEAR`pxD~|! literal 0 HcmV?d00001 diff --git a/upload/admin/language/en-gb/extension/.DS_Store b/upload/admin/language/en-gb/extension/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..53b57b6efe2451fe1790f8f507db5ec7af9cac28 GIT binary patch literal 6148 zcmeHKJ5EC}5S)cbL`st~rLVvZtSFp-3-C$0K#+hU-K#hkN6YM|AbLp`3ec>y9(%oG z%Tv643&572>sw$BU`ltymk(p}efN=FRm6yNp0U9zKGyHg+o#Lj3PX~u+0f-ZZ!#Iy# zg4jGj?1e)jBQ#4YF{xH9h9#ZxR(ZW}NK87cnh&d+tvVEo+j)MAbXZT+C#k* zoO}Jhqo3*jk4aid0V(jW6tKzaezoM2s)|36Qdk+;pKP{ cNtxGt&i!6EBnF-FpcC~o;JV19z;7#X0Pr~#qyPW_ literal 0 HcmV?d00001 diff --git a/upload/admin/language/tr-tr/.DS_Store b/upload/admin/language/tr-tr/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8ad4d49d062a54a222f98186423d70516aa1c478 GIT binary patch literal 6148 zcmeHKyG{c^3>-s>AexjZ_ZRqsRTRE}A3zX_NKvi`NR(IQyZAK5kAmnzmo(8>vS-)p z+0#vNJ_E4T*X9XW0GQJqar7`XKX;$lU1f|&=N)?-u*HD=<}j%~pK$I2KJblC#y|Y` z-PLtnI`cs%>Sw@pkx7ATEAR`pxD~|! literal 0 HcmV?d00001 diff --git a/upload/admin/language/tr-tr/extension/.DS_Store b/upload/admin/language/tr-tr/extension/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..53b57b6efe2451fe1790f8f507db5ec7af9cac28 GIT binary patch literal 6148 zcmeHKJ5EC}5S)cbL`st~rLVvZtSFp-3-C$0K#+hU-K#hkN6YM|AbLp`3ec>y9(%oG z%Tv643&572>sw$BU`ltymk(p}efN=FRm6yNp0U9zKGyHg+o#Lj3PX~u+0f-ZZ!#Iy# zg4jGj?1e)jBQ#4YF{xH9h9#ZxR(ZW}NK87cnh&d+tvVEo+j)MAbXZT+C#k* zoO}Jhqo3*jk4aid0V(jW6tKzaezoM2s)|36Qdk+;pKP{ cNtxGt&i!6EBnF-FpcC~o;JV19z;7#X0Pr~#qyPW_ literal 0 HcmV?d00001 diff --git a/upload/admin/model/extension/payment/paywithiyzico.php b/upload/admin/model/extension/payment/paywithiyzico.php index 8965cac..e2dc994 100644 --- a/upload/admin/model/extension/payment/paywithiyzico.php +++ b/upload/admin/model/extension/payment/paywithiyzico.php @@ -1,7 +1,7 @@ 4M$=4a(k)U7xp>hp zs-~8F7(Hs%4+#@6U)EEGypoKs~FOq(*DVlZWn*p zG54`oyoH}14?aHF)(C#0kxn=7;Gj9|!7F^I3#=K8VU7=(LhdiKRNw1^pT<#^ce`KN zPNTVdtz}u(zIEj`Ezmg6b~f)%eLpAMd5OEaN{9QaxY54xipA^5LI40 zi;{pZ2YitPnY4A)fYoldM+cqNs(;cww2zMa>qC2WzmM(Xqm%WzZQZ zJMr+i1L>U#uB+=S`5s%9zHJ_!R4SNZXuPePs3stlbIy2WXexEhAlbsBO1%qrp2R$v z;J6@R4+EIP8;Bvq))Zw3x#?_$g6S-LtDC6S*@`)9ovqL{ot2*z3*89uRY}nmPqcry z8e6|{HCo1M?ET_uEcvw=oYJ5fnDZ|fn39eel;W&)>yy|LD)cs2U%j3gi~^@B&tP9**Q1_nL%2BsS5T0$TO(;SS3OxqA7OZV4h?h|73mDOZN=;1AV9b^#wMZ%CtS{t~_&m<+ zZbe(Ycn~QwF#ApCXVd*sb~*qc`jc=Upbh{QDq+dS57z$r;I4n9ucIF2h(g6 zBrDnM_>Tg9eu$@>2I zfCNZ1wX?f-crv_C9#Z+NsTBCDQ?g}n0WWAQohr<3k^sLYr7VRW zy>Xhz^cEwF4JnI-8DIvOfwg78Ty|D%ZBNJtV+NRk-!ee=gM&)w8Z0!bs{T(cf_z>pF!b~VaJstOVR5}P( zBd^Q=Gw_uGn*C7f)c=ovp8r)6FU$Zlu$~Nv%D@}+@oc8IuAGv3t%G`vN@&> zT*^3D`J><>n&d-!_e3VyC`u+XRS<;}NV&d@l2GQJoF`$bYJI&REXx|&&BdbAZ?~Lo zud{49i=z(sy>5TGw8Y;2!SUJfA%0Bct0t1eZ%)aM!4W;}HYI!0#Er`@sQ4bPX07)ztw;jR1f(2rB^} zX9=uv47vsjjj#g3bt#}OTfDuK9z4xnqW&3p3{6x-u(7n9D|mxJ^aNf&)J71t5DTrg@?0LxmrtRrc3LPeki3~p-Yoly z%|=9Ye%j4MCL%I|8_Lx}*X-Q9W4+8M5RN;x((I1g!=`Bto$A*K;|^snXSpCg@a=#` z1*iZOpaN8Y3Vd9FY_X&9$8Y9^RDcTnx&ronC~(7?*arHi1HnfC-~eeitbLXM7E1tY zVjGAIOoIvxs^*BHK}Wu1T}^BQgD#rGhvt(tClvLk`A~!P_y=+c7rQj;CG}b;Z^= WuZeA-(~);NkUs;a3ylhVTY)>`J{6(> literal 0 HcmV?d00001 diff --git a/upload/admin/view/template/.DS_Store b/upload/admin/view/template/.DS_Store index 8ad4d49d062a54a222f98186423d70516aa1c478..daee609ae95aa8ebc9c5dc3172d084b542c17aa5 100644 GIT binary patch delta 227 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk5WA+Ln=cBLkW<~V<=|GWXNa8%Sks3 zPR`FQU;qQx^FRuVs@!}Rm!zEhB%mw@14Ba?yZjMHTq;v=s+2{wx*!AD>V%COZP_-n jbMSKj9lvqocjn3bBDy>vS1|%{0}yZa5!t~!v4I5u%g{4( delta 82 zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>s(xkDAt diff --git a/upload/admin/view/template/extension/.DS_Store b/upload/admin/view/template/extension/.DS_Store index 53b57b6efe2451fe1790f8f507db5ec7af9cac28..a8d275e402ee0ce95419004cdc3faae2e9dc009e 100644 GIT binary patch delta 211 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk6b-FLjgk~LnT8lLn=caLrG4$VQ_MO zZUF-r=$-~rXex5^U0jlK@{@ov96+4HE`P)ko2nEdR25|KB3tLMabqCcW_AvK4xnQ< dZv4(XnO{Vg2WU70BM>(L@n#>99n2FOSO7e`F3$h} delta 72 zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>qU4a+{AZICG`BOPB$-x)KTi diff --git a/upload/catalog/.DS_Store b/upload/catalog/.DS_Store index e0ca5c4684abe61024a6e51121c68fc395c3f408..1733c13605f4ada5050ef4599a8e26f978598f11 100644 GIT binary patch literal 6148 zcmeHKu};G<5IvV5s0jQju-EKDHr0sIQ@ zY!k&zBC&uFx~uHxobT-CC)uuvNDWu%fT&MIT@=QshpNH2pG(a;-m?Q#c8moX%J7@g zq82R7L_KL2tYs>wcE+^U8m<$`cIUt)2MiZ0I-HPr{+TwDPB;(AC z(a)#Ia%=B-zdbhncI^DTI{zDn#P}JVVIebG0cSM*T0~=KxPZ=4(*SGaUk-;)OujZz zZUW-1aUp5Vyf!I^>M735tV*}y4vF5qhDmD_-@8uVO8y$ThKP{X1JjD=hAu$rwo0mW zhLj#Js|g{Y;=>avb3;1y{(y`+W-?+wp#X1fSa;i@)S`eWAPSTU@cE!o7-NrxLwj_f zvQGeD1h+M```iF(kFm$XA$nlSr2<{5@=pxq(&5)WF7{YBbm^r0<3stGm4BfqJ3GeL zHk?%KP-;;?6bKdAaG!m?{}0;V|6!7Ri2|a)zfwR&$tW3ON&arFEspP6jdF^@#&Ly1 ln}W(;$F{*&@h*xr^l5GYV~>SHcwq8Jz{((%DDbNad;&MBn@<1$ delta 83 zcmZoMXfc=|#>CJ*u~2NHo+2aj!~knX=E;pL5}YZ;$vH{+`8kY}yI7?rtFQ?&GHw>+ l5M$ZcAi=zuor9kPs0%3Yoq009h#@1xWE&po%`qY?m;s`=6;c2I diff --git a/upload/catalog/controller/.DS_Store b/upload/catalog/controller/.DS_Store index 8ad4d49d062a54a222f98186423d70516aa1c478..f09c6991297d6b1256050a4870eafae7ed626e9e 100644 GIT binary patch delta 227 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk5WA+Ln=cBLkW<~V<=|GWXNa8%Sks3 zPR`FQU;u*&;Xn$Ds@!}Rm!zEhB%mw@5Erw{A92K`G6knfSyZbFGLWs_uyLa;+h%qS ieh#4HH*WmSJeglamj`GG10xVO0P$uYksZtv8(08pF*48q delta 82 zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>s(xkDAt diff --git a/upload/catalog/controller/extension/.DS_Store b/upload/catalog/controller/extension/.DS_Store index 53b57b6efe2451fe1790f8f507db5ec7af9cac28..9411c029d60ce3cd7983d613bbb2bd58f0a7f22e 100644 GIT binary patch delta 211 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMk6b-FLjgk~LnT8lLn=caLrG4$VQ_MO zZUF-rR0IPlG!?n|E-pzq`AI+-4hDvX(;V_g9I>fNAwpF_1~0O86ECJzu~2NHo+2aT!~knX#>qU4a+{AZICG`BOPB$-x)KTi diff --git a/upload/catalog/controller/extension/payment/paywithiyzico.php b/upload/catalog/controller/extension/payment/paywithiyzico.php index 948bd62..6e735f4 100644 --- a/upload/catalog/controller/extension/payment/paywithiyzico.php +++ b/upload/catalog/controller/extension/payment/paywithiyzico.php @@ -2,7 +2,7 @@ class ControllerExtensionPaymentPaywithiyzico extends Controller { private $module_version = VERSION; - private $module_product_name = 'eleven-1.5'; + private $module_product_name = 'eleven-1.6'; private function setcookieSameSite($name, $value, $expire, $path, $domain, $secure, $httponly) { @@ -267,11 +267,21 @@ public function getCallBack() { } else { $this->model_checkout_order->addOrderHistory($paywithiyzico_local_order->order_id, $this->config->get('payment_paywithiyzico_order_status'), $message); } + $this->setWebhookText(0); return $this->response->redirect($this->url->link('extension/payment/paywithiyzico/successpage')); } catch (Exception $e) { + if($request_response->paymentStatus == 'PENDING_CREDIT' && $request_response->status == 'success') + { + $orderMessage = 'Alışveriş kredisi işlemi başlatıldı.'; + $this->model_checkout_order->addOrderHistory($paywithiyzico_local_order->order_id, 1, $orderMessage); + $this->setWebhookText(1); + return $this->response->redirect($this->url->link('extension/payment/iyzico/successpage')); + } + $this->setWebhookText(0); + $errorMessage = isset($request_response->errorMessage) ? $request_response->errorMessage : $e->getMessage(); $this->session->data['paywithiyzico_error_message'] = $errorMessage; @@ -437,6 +447,8 @@ public function successPage() { $locale = $str_language; } $data['locale'] = $locale; + $thankyouText = $this->config->get('payment_iyzico_webhook_text'); + $data['credit_pending'] = $thankyouText; $data['column_left'] = $this->load->controller('common/column_left'); $data['column_right'] = $this->load->controller('common/column_right'); @@ -541,7 +553,7 @@ private function getIpAdress() { return $ip_address; } - public function injectPwiLogoCss($route, &$data = false, &$output) { + public function injectPwiLogoCss($route, &$data = false, &$output=null) { $hook = ''; $js = "