Dodana moznost za storniranje placila
This commit is contained in:
pero1203
parent
23f71002b0
commit
7e7602a495
@ -278,9 +278,14 @@ function urediPlaciloClose(){
|
||||
function brisiPlacilo(placilo_id){
|
||||
|
||||
if(confirm('Ste prepričani?')){
|
||||
|
||||
$("#placila").load('ajax.php?t=userPlacila&a=deletePlacilo', {placilo_id: placilo_id}, function () {
|
||||
|
||||
});
|
||||
$("#placila").load('ajax.php?t=userPlacila&a=deletePlacilo', {placilo_id: placilo_id});
|
||||
}
|
||||
}
|
||||
|
||||
// Storniranje placila
|
||||
function stornirajPlacilo(placilo_id){
|
||||
|
||||
if(confirm('Ste prepričani?')){
|
||||
$("#placila").load('ajax.php?t=userPlacila&a=stornirajPlacilo', {placilo_id: placilo_id});
|
||||
}
|
||||
}
|
||||
@ -346,7 +346,7 @@ class UserNarocila{
|
||||
echo '<td>'.$data_row['package_name'].'</td>';
|
||||
echo '<td>'.$data_row['trajanje'].'</td>';
|
||||
echo '<td data-order="'.date("Y-n-j", strtotime($data_row['time'])).'">'.date("j.n.Y H:i", strtotime($data_row['time'])).'</td>';
|
||||
echo '<td>'.$data_row['payment_method'].'</td>';
|
||||
echo '<td>'.$lang['srv_narocilo_nacin_placila_'.$data_row['payment_method']].'</td>';
|
||||
|
||||
// Ali placa ddv (podjetje - zavezanec iz tujine ga ne)
|
||||
echo '<td>'.($this->isWithoutDDV($data_row['id']) ? $lang['no'] : $lang['yes']).'</td>';
|
||||
@ -373,7 +373,7 @@ class UserNarocila{
|
||||
echo $lang['srv_narocilo_status_'.$data_row['status']];
|
||||
|
||||
// Na www.1ka.si lahko narocilo placa samo Goran
|
||||
if($data_row['status'] != '1' && ($app_settings['app_name'] != 'www.1ka.si' || $global_user_id == '112696'))
|
||||
if($data_row['status'] != '1' && $data_row['status'] != '2' && ($app_settings['app_name'] != 'www.1ka.si' || $global_user_id == '112696'))
|
||||
echo ' | <span class="as_link" onClick="urediNarociloPay(\''.$data_row['id'].'\')">'.$lang['srv_narocilo_placaj'].'</span>';
|
||||
|
||||
echo '</td>';
|
||||
|
||||
@ -119,7 +119,7 @@ class UserPlacila{
|
||||
|
||||
// Izpisemo seznam vseh placil
|
||||
public function displayPlacilaTable(){
|
||||
global $lang, $global_user_id;
|
||||
global $lang, $global_user_id, $app_settings;
|
||||
|
||||
// Admini vidijo vsa placila
|
||||
$data = $this->getPlacila();
|
||||
@ -136,6 +136,7 @@ class UserPlacila{
|
||||
echo ' <th>'.$lang['srv_placilo_price'].'</th>';
|
||||
echo ' <th>'.$lang['srv_narocilo_ddv'].'</th>';
|
||||
echo ' <th>'.$lang['srv_placilo_payment_method'].'</th>';
|
||||
echo ' <th>'.$lang['srv_placilo_stornirano'].'</th>';
|
||||
echo ' <th>'.$lang['edit2'].'</th>';
|
||||
echo ' </tr>';
|
||||
echo ' </thead>';
|
||||
@ -170,12 +171,29 @@ class UserPlacila{
|
||||
echo '<td>'.($UA->isWithoutDDV($data_row['narocilo']['id']) ? $lang['no'] : $lang['yes']).'</td>';
|
||||
|
||||
// Payment method
|
||||
echo '<td>'.$data_row['payment_method'].'</td>';
|
||||
echo '<td>'.$lang['srv_narocilo_nacin_placila_'.$data_row['payment_method']].'</td>';
|
||||
|
||||
// Stornirano method
|
||||
echo '<td>'.($data_row['canceled'] == '1' ? $lang['yes'] : $lang['no']).'</td>';
|
||||
|
||||
// Edit / delete
|
||||
echo '<td>';
|
||||
echo '<a href="#" onClick="displayPlaciloPopup(\''.$data_row['id'].'\')" title="'.$lang['srv_placila_edit'].'"><i class="fa fa-pencil-alt link-sv-moder"></i> <span class="no-print"> | </span>';
|
||||
echo '<a href="#" onClick="brisiPlacilo(\''.$data_row['id'].'\')" title="'.$lang['srv_placila_delete'].'"><i class="fa fa-times link-sv-moder"></a>';
|
||||
// Na www.1ka.si lahko placilo ureja samo Goran
|
||||
if($app_settings['app_name'] != 'www.1ka.si' || $global_user_id == '112696'){
|
||||
|
||||
// Uredi
|
||||
echo '<a href="#" onClick="displayPlaciloPopup(\''.$data_row['id'].'\')" title="'.$lang['srv_placila_edit'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a> <span class="no-print"> | </span>';
|
||||
|
||||
// Brisi
|
||||
echo '<a href="#" onClick="brisiPlacilo(\''.$data_row['id'].'\')" title="'.$lang['srv_placila_delete'].'"><i class="fa fa-times link-sv-moder"></i></a>';
|
||||
|
||||
// Storniraj
|
||||
if($data_row['canceled'] != '1')
|
||||
echo ' <span class="no-print"> | </span><a href="#" onClick="stornirajPlacilo(\''.$data_row['id'].'\')" title="'.$lang['srv_placila_storniraj'].'">Storniraj</a>';
|
||||
}
|
||||
else{
|
||||
echo '/';
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
echo '</tr>';
|
||||
@ -472,5 +490,23 @@ class UserPlacila{
|
||||
// Na novo izrisemo tabelo z narocili
|
||||
$this->displayPlacila();
|
||||
}
|
||||
|
||||
// Storniramo narocilo
|
||||
if($_GET['a'] == 'stornirajPlacilo') {
|
||||
|
||||
if($placilo_id > 0){
|
||||
$sqlPlaciloStatus = sisplet_query("UPDATE user_access_placilo SET canceled='1' WHERE id='".$placilo_id."'");
|
||||
|
||||
// Nastavimo se status narocila na storniran
|
||||
$sqlPlacilo = sisplet_query("SELECT narocilo_id FROM user_access_placilo WHERE id='".$placilo_id."'");
|
||||
if(mysqli_num_rows($sqlPlacilo) > 0){
|
||||
$rowPlacilo = mysqli_fetch_array($sqlPlacilo);
|
||||
$sqlNarociloStatus = sisplet_query("UPDATE user_access_narocilo SET status='2' WHERE id='".$rowPlacilo['narocilo_id']."'");
|
||||
}
|
||||
}
|
||||
|
||||
// Na novo izrisemo tabelo z narocili
|
||||
$this->displayPlacila();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -7399,7 +7399,7 @@ $lang = array (
|
||||
|
||||
'srv_narocilo_status_0' => "Neplačano",
|
||||
'srv_narocilo_status_1' => "Plačano",
|
||||
'srv_narocilo_status_2' => "Preklicano",
|
||||
'srv_narocilo_status_2' => "Stornirano",
|
||||
|
||||
'srv_narocilo_email_predracun_subject' => "Oddano naročilo št. ",
|
||||
'srv_narocilo_email_predracun_content1' => "Hvala za oddano naročilo.",
|
||||
@ -7448,12 +7448,14 @@ $lang = array (
|
||||
'srv_placila_create' => "Dodaj novo plačilo",
|
||||
'srv_placila_edit' => "Uredi plačilo",
|
||||
'srv_placila_delete' => "Pobriši plačilo",
|
||||
'srv_placila_storniraj' => "Storniraj plačilo",
|
||||
'srv_placila_list' => "Seznam vseh plačil",
|
||||
'srv_placilo_narocilo' => "Naročilo",
|
||||
'srv_placilo_note' => "Opomba",
|
||||
'srv_placilo_time' => "Čas plačila",
|
||||
'srv_placilo_price' => "Znesek",
|
||||
'srv_placilo_payment_method' => "Način plačila",
|
||||
'srv_placilo_stornirano' => "Stornirano",
|
||||
|
||||
|
||||
// DOSTOP GLEDE NA PAKET
|
||||
|
||||
@ -7331,12 +7331,14 @@ $lang = array (
|
||||
'srv_placila_create' => "Add new payment",
|
||||
'srv_placila_edit' => "Edit payment",
|
||||
'srv_placila_delete' => "Delete payment",
|
||||
'srv_placila_storniraj' => "Cancel payment",
|
||||
'srv_placila_list' => "Payments list",
|
||||
'srv_placilo_narocilo' => "Order",
|
||||
'srv_placilo_note' => "Note",
|
||||
'srv_placilo_time' => "Payment time",
|
||||
'srv_placilo_price' => "Price",
|
||||
'srv_placilo_payment_method' => "Payment method",
|
||||
'srv_placilo_stornirano' => "Canceled",
|
||||
|
||||
|
||||
// DOSTOP GLEDE NA PAKET
|
||||
|
||||
@ -9282,3 +9282,7 @@ UPDATE misc SET value='20.07.29' WHERE what="version";
|
||||
UPDATE srv_user_setting_for_survey SET value = '1ka' WHERE what = 'default_chart_profile_skin' AND value = '1ka';
|
||||
|
||||
UPDATE misc SET value='20.08.10' WHERE what="version";
|
||||
|
||||
ALTER TABLE user_access_placilo ADD COLUMN canceled ENUM('0', '1') NOT NULL DEFAULT '0';
|
||||
|
||||
UPDATE misc SET value='20.09.11' WHERE what="version";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user