From 7926a2fb5f104f42c94569673f468fd45209f488 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Wed, 26 Jan 2022 23:43:21 +0100 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Naro=C4=8Dila=20-=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payments/classes/class.UserNarocila.php | 73 ++++++++++++------- lang/1.php | 6 ++ lang/2.php | 6 ++ .../sass/admin_new/basic/icons/icons.scss | 3 + 4 files changed, 61 insertions(+), 27 deletions(-) diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index bffabb1fa..de38a20d7 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -344,11 +344,14 @@ class UserNarocila{ // Ni nobenega paketa if(mysqli_num_rows($sqlA) == 0){ - $package_string = $lang['paket_opis_1ka'].' ('.$lang['srv_access_package_free'].')
'; + + $package_string = '
'.$lang['paket_opis_1ka'].' ('.$lang['srv_access_package_free'].')
'; + $package_string .= '
'; } else{ + $userAccess = UserAccess::getInstance($global_user_id); - $package_name = $userAccess->getPackageName($rowA['package_id']); + $package_name = $userAccess->getPackageName($rowA['package_id']); // Ce ima paket 2 ali 3 if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){ @@ -356,12 +359,11 @@ class UserNarocila{ // Ce je paket ze potekel if(strtotime($rowA['time_expire']) < time()){ - $package_string = ''; - $package_string .= $package_name; - $package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')'; - $package_string .= ''; - - $package_string .= '
'; + $package_string = '
'.$package_name.'
'; + $package_string .= '
'.date("d.m.Y", strtotime($rowA['time_activate'])).'
'; + $package_string .= '
'.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).'
'; + + $package_string .= '
'; } else{ $package_string = '
'.$package_name.'
'; @@ -372,10 +374,8 @@ class UserNarocila{ } } else{ - $package_string = $package_name; - $package_string .= ' ('.$lang['srv_access_package_free'].')'; - - $package_string .= '
'; + $package_string = '
'.$package_name.' ('.$lang['srv_access_package_free'].')
'; + $package_string .= '
'; } } echo $package_string; @@ -416,37 +416,55 @@ class UserNarocila{ echo ' '; echo ' '; - echo ' '.$lang['srv_narocilo_paket'].''; - echo ' '.$lang['srv_narocilo_trajanje'].' ('.$lang['srv_narocilo_trajanje_mesecev'].')'; echo ' '.$lang['srv_narocilo_cas'].''; - echo ' '.$lang['srv_narocilo_nacin_placila'].''; - echo ' '.$lang['srv_narocilo_cena'].''; + echo ' '.$lang['srv_narocilo_paket'].''; + echo ' '.$lang['srv_narocilo_veljavnodo'].''; + echo ' '.$lang['srv_narocilo_samo_cena'].''; echo ' '.$lang['srv_narocilo_status'].''; - echo ' '.$lang['srv_narocilo_pdf'].''; - + echo ' '.$lang['srv_narocilo_pdf_predracun'].''; + echo ' '.$lang['srv_narocilo_pdf_racun'].''; echo ' '; echo ' '; // Vsebina tabele echo ' '; + $userAccess = UserAccess::getInstance($global_user_id); + foreach($data as $usr_id => $data_row){ + $package_name = $userAccess->getPackageName($data_row['package_id']); + echo ''; - echo ''.$data_row['package_name'].''; - echo ''.$data_row['trajanje'].''; echo ''.date("j.n.Y H:i", strtotime($data_row['time'])).''; - echo ''.$data_row['payment_method'].''; + + //Sklanjanje za število mesecev + if ($data_row['trajanje'] == 1) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_1']; + else if ($data_row['trajanje'] == 2) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_2']; + else if ($data_row['trajanje'] == 3 || $data_row['trajanje'] == 4) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_3_4']; + else + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_5']; + + echo ''.$package_name.' ('.$trajanje.')'; + + //Veljavnost paketa + $meseci = $data_row['trajanje']; + $veljaven_do = date("j.n.Y H:i", strtotime("+$meseci months", strtotime($data_row['time']))); + + echo ''.$veljaven_do.''; // Cena $cena = $this->getPrice($data_row['package_name'], $data_row['trajanje'], $data_row['discount'], $data_row['time']); // Zavezanec iz tujine nima ddv-ja if($this->isWithoutDDV($data_row['id'])) - echo ''.$cena['final_without_tax'].''; + echo ''.$cena['final_without_tax'].'€'; else - echo ''.$cena['final'].''; + echo ''.$cena['final'].'€'; if($data_row['status'] == '0') $status_color = 'red'; @@ -457,12 +475,13 @@ class UserNarocila{ echo ''.$lang['srv_narocilo_status_'.$data_row['status']].''; // PDF - echo ''; - echo ''.$lang['srv_narocilo_pdf_predracun'].''; + echo ''; + if($data_row['status'] == '1'){ - echo ' | '.$lang['srv_narocilo_pdf_racun'].''; + echo ''; } - echo ''; + else + echo ''; echo ''; } diff --git a/lang/1.php b/lang/1.php index ae090a806..a020a0c06 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7632,8 +7632,14 @@ $lang = array ( 'srv_narocilo_paket' => "Paket", 'srv_narocilo_trajanje' => "Trajanje", 'srv_narocilo_trajanje_mesecev' => "mesecev", + 'srv_narocilo_trajanje_1' => "mesec", + 'srv_narocilo_trajanje_2' => "meseca", + 'srv_narocilo_trajanje_3_4' => "meseci", + 'srv_narocilo_trajanje_5' => "mesecev", + 'srv_narocilo_veljavnodo' => "Paket veljaven do:", 'srv_narocilo_cena_brez_popusta' => "Cena brez popusta", 'srv_narocilo_cena' => "Končna cena", + 'srv_narocilo_samo_cena' => "Cena", 'srv_narocilo_popust' => "Popust", 'srv_narocilo_nacin_placila' => "Način plačila", 'srv_narocilo_nacin_placila_1' => "Bančno nakazilo", diff --git a/lang/2.php b/lang/2.php index 178cb8210..e032a49ff 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7520,9 +7520,15 @@ $lang = array ( 'srv_narocilo_paket' => "Package", 'srv_narocilo_trajanje' => "Duration", 'srv_narocilo_trajanje_mesecev' => "months", + 'srv_narocilo_trajanje_1' => "month", + 'srv_narocilo_trajanje_2' => "months", + 'srv_narocilo_trajanje_3_4' => "months", + 'srv_narocilo_trajanje_5' => "months", + 'srv_narocilo_veljavnodo' => "Package valid until:", 'srv_narocilo_cena_brez_popusta' => "Price without discount", 'srv_narocilo_popust' => "Discount", 'srv_narocilo_cena' => "Final price", + 'srv_narocilo_samo_cena' => "Price", 'srv_narocilo_nacin_placila' => "Payment method", 'srv_narocilo_nacin_placila_1' => "Bank Transfer", 'srv_narocilo_nacin_placila_2' => "PayPal", diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss index 8fb1f4573..949adf9de 100644 --- a/resources/sass/admin_new/basic/icons/icons.scss +++ b/resources/sass/admin_new/basic/icons/icons.scss @@ -55,6 +55,9 @@ a.faicon{ &.green { color: $green; } + &.red { + $color: $red; + } //STACKING &.fa-stack {