@@ -121,7 +121,7 @@ |
||
| 121 | 121 | // INNER JOIN `%2$s` ON `%1$s`.`id`=`%2$s`.`id` WHERE `%1$s`.`borrower`="%3$s"', $xoopsDB->prefix('equipment_rentals'), $xoopsDB->prefix('equipment_equipment'), $xoopsUser->uname()); |
| 122 | 122 | |
| 123 | 123 | $borrow_sql = 'SELECT r.quantity, e.name, c.first, c.last FROM ' . $xoopsDB->prefix('equipment_equipment') . ' AS e, ' . $xoopsDB->prefix('equipment_customer') . ' AS c, ' |
| 124 | - . $xoopsDB->prefix('equipment_rentals') . ' AS r WHERE e.id = r.equipmentid AND c.id = r.customerid'; |
|
| 124 | + . $xoopsDB->prefix('equipment_rentals') . ' AS r WHERE e.id = r.equipmentid AND c.id = r.customerid'; |
|
| 125 | 125 | |
| 126 | 126 | $borrow_data = EquipmentUtility::getQueryDataToJSON($borrow_sql); |
| 127 | 127 | |
@@ -357,10 +357,10 @@ |
||
| 357 | 357 | } |
| 358 | 358 | } else { |
| 359 | 359 | xoops_confirm(array( |
| 360 | - 'ok' => 1, |
|
| 361 | - 'id' => Request::getString('id', ''), |
|
| 362 | - 'op' => 'delete' |
|
| 363 | - ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $equipmentObject->getVar('name'))); |
|
| 360 | + 'ok' => 1, |
|
| 361 | + 'id' => Request::getString('id', ''), |
|
| 362 | + 'op' => 'delete' |
|
| 363 | + ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $equipmentObject->getVar('name'))); |
|
| 364 | 364 | } |
| 365 | 365 | break; |
| 366 | 366 | |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $xoopsTpl->assign('json_data', $json_data); |
| 50 | 50 | |
| 51 | 51 | $borrow_sql = 'SELECT r.quantity, e.name, e.owner, c.first, c.last FROM ' . $xoopsDB->prefix('equipment_equipment') . ' AS e, ' . $xoopsDB->prefix('equipment_customer') . ' AS c, ' |
| 52 | - . $xoopsDB->prefix('equipment_rentals') . ' AS r WHERE e.id = r.equipmentid AND c.id = r.customerid'; |
|
| 52 | + . $xoopsDB->prefix('equipment_rentals') . ' AS r WHERE e.id = r.equipmentid AND c.id = r.customerid'; |
|
| 53 | 53 | |
| 54 | 54 | $query1 = $xoopsDB->query($borrow_sql); |
| 55 | 55 | |
@@ -342,10 +342,10 @@ |
||
| 342 | 342 | } |
| 343 | 343 | } else { |
| 344 | 344 | xoops_confirm(array( |
| 345 | - 'ok' => 1, |
|
| 346 | - 'id' => Request::getString('id', ''), |
|
| 347 | - 'op' => 'delete' |
|
| 348 | - ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $customerObject->getVar('last'))); |
|
| 345 | + 'ok' => 1, |
|
| 346 | + 'id' => Request::getString('id', ''), |
|
| 347 | + 'op' => 'delete' |
|
| 348 | + ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $customerObject->getVar('last'))); |
|
| 349 | 349 | } |
| 350 | 350 | break; |
| 351 | 351 | |
@@ -223,10 +223,10 @@ |
||
| 223 | 223 | } |
| 224 | 224 | } else { |
| 225 | 225 | xoops_confirm(array( |
| 226 | - 'ok' => 1, |
|
| 227 | - 'id' => Request::getString('id', ''), |
|
| 228 | - 'op' => 'delete' |
|
| 229 | - ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $rentalsObject->getVar('customerid'))); |
|
| 226 | + 'ok' => 1, |
|
| 227 | + 'id' => Request::getString('id', ''), |
|
| 228 | + 'op' => 'delete' |
|
| 229 | + ), Request::getCmd('REQUEST_URI', '', 'SERVER'), sprintf(AM_EQUIPMENT_FORMSUREDEL, $rentalsObject->getVar('customerid'))); |
|
| 230 | 230 | } |
| 231 | 231 | break; |
| 232 | 232 | |