From d55bee3bd7a50d1786f299b2dda2e8edf302d5be Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 6 Oct 2020 00:09:00 +0200 Subject: [PATCH] Drupal: PayPal placilo --- .../nakupovanje_1ka/nakupovanje_1ka.module | 30 ++++++++++++-- .../sites/all/themes/pro1ka/js/script.js | 26 ++++++++---- .../nakupovanje-1ka-kosarica.tpl.php | 22 +++++----- .../nakupovanje-1ka-paypal-cancel.tpl.php | 25 +++++++++++ .../nakupovanje-1ka-paypal-return.tpl.php | 41 +++++++++++++++---- 5 files changed, 112 insertions(+), 32 deletions(-) create mode 100644 frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-cancel.tpl.php diff --git a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module index 4490c21e4..128047b86 100644 --- a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module +++ b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module @@ -18,8 +18,8 @@ function nakupovanje_1ka_menu() ]; $items['narocilo/paypal'] = [ - 'title' => 'Avtorizacija podatkov', //page title - 'description' => 'Preverjam naročilo, če je res plačano preko PayPala', + 'title' => 'Uspešno plačilo preko PayPala', //page title + 'description' => 'Plačilo je bilo opravljeno preko PayPal-a', 'page callback' => 'nakupovanje_1ka_paypal_return', //callback function which is invoked when menu item is called. 'access callback' => true, //any user can access this page 'page arguments' => [ @@ -27,6 +27,17 @@ function nakupovanje_1ka_menu() ], ]; + $items['narocilo/paypal-cancel'] = [ + 'title' => 'Preklicano plačilo preko PayPala', //page title + 'description' => 'Uporabnik je preklical plačilo', + 'page callback' => 'nakupovanje_1ka_paypal_cancel', //callback function which is invoked when menu item is called. + 'access callback' => true, //any user can access this page + 'page arguments' => [ + 1, + ], + ]; + + $items['narocilo-pregled/%/pdf'] = [ 'title' => 'Uspešno opravljen nakup', //page title 'description' => 'Pridobimo PDF pred/računa', @@ -168,9 +179,15 @@ function nakupovanje_1ka_pdf() function nakupovanje_1ka_paypal_return() { - return theme('nalupovanje_1ka_paypal'); + return theme('nakupovanje_1ka_paypal_return'); } +function nakupovanje_1ka_paypal_cancel() +{ + return theme('nakupovanje_1ka_paypal_cancel'); +} + + function cenik_paketov_1ka_zasebni_uporabniki() { return theme('nakupovanje_1ka_cenik_paketov_zasebni_uporabniki'); @@ -209,11 +226,16 @@ function nakupovanje_1ka_theme($existing, $type, $theme, $path) 'path' => $path_to_theme.'/templates/', ]; - $themes['nalupovanje_1ka_paypal'] = [ + $themes['nakupovanje_1ka_paypal_return'] = [ 'template' => 'nakupovanje-1ka-paypal-return', 'path' => $path_to_theme.'/templates/', ]; + $themes['nakupovanje_1ka_paypal_cancel'] = [ + 'template' => 'nakupovanje-1ka-paypal-cancel', + 'path' => $path_to_theme.'/templates/', + ]; + $themes['nakupovanje_1ka_cenik_paketov_zasebni_uporabniki'] = [ 'template' => 'nakupovanje-1ka-cenik-zasebni-uporabniki', 'path' => $path_to_theme.'/templates/', diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index c252b95df..787f94f53 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -789,23 +789,33 @@ } } - if (window.location.pathname.indexOf('/narocilo/paypal') > -1) { - jQuery.post('/frontend/payments/api.php?action=check_paypal').done(function (val) { + if (window.location.pathname.indexOf('/narocilo/paypal-cancel?narocilo_id') > -1 && location.search.split('narocilo_id=').length > 1) { + var narocilo = location.search.split('narocilo_id=')[1]; + + jQuery.post('/frontend/payments/api.php?action=capture_narocilo_paypal', { + narocilo_id: narocilo + }).done(function (val) { val = JSON.parse(val); if (val.error) { return jQuery('.procesiram-narocilo').text(val.error); } - //TODO: SUtrezno dopolni ko je pay pal zaključen + }); + } - // Glede na jezik preusmerimo na slovensko oz. angleško verzijo - var urlRedirect = "/d/narocilo-pregled/racun/pdf"; - if (lang() == 'en') { - urlRedirect = "/d/en/purchase/invoice/pdf"; + if (window.location.href.indexOf('/narocilo/paypal?narocilo_id') > -1 && location.search.split('narocilo_id=').length > 1) { + var narocilo = location.search.split('narocilo_id=')[1]; + + jQuery.post('/frontend/payments/api.php?action=cancel_narocilo_paypal', { + narocilo_id: narocilo + }).done(function (val) { + val = JSON.parse(val); + + if (val.error) { + return jQuery('.procesiram-narocilo').text(val.error); } - window.location = urlRedirect; }); } diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php index 5c32c762f..95a741862 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php @@ -526,17 +526,17 @@ - - - -language == 'sl'): ?> - - - - - - - + + + + + diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-cancel.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-cancel.tpl.php new file mode 100644 index 000000000..62bbfbd19 --- /dev/null +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-cancel.tpl.php @@ -0,0 +1,25 @@ + + +
+ +
+

+ language == 'sl'): ?> + Zahvaljujemo se vam za vaš nakup preko PayPal računa. Vaš novi paket je aktiven in ga lahko pričnete uporabljati. + + Thank you for your purchase using PayPal! Your new package is now active and you can use it. + +

+
+ +
+
+ language == 'sl'): ?> + Vrni se na naslovno stran + + Return to home page + +
+
+ +
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-return.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-return.tpl.php index 017f19607..48aed441c 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-return.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-paypal-return.tpl.php @@ -1,11 +1,34 @@ - + + + +
+ +
+

+ language == 'sl'): ?> + Zahvaljujemo se vam za vaš nakup preko PayPal računa. Vaš novi paket je aktiven in ga lahko pričnete uporabljati. + + Thank you for your purchase using PayPal! Your new package is now active and you can use it. + +

+
+ +
+
+ language == 'sl'): ?> + Ustvari anketo + + Create a survey + +
+ +
+ language == 'sl'): ?> + Vrni se na naslovno stran + + Return to home page + +
+
-