springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Added shipments delete

Browse source
This commit is contained in:
Karl Cordes 2013-04-29 23:00:24 +10:00
parent 24eaa4c0cd
commit 573971310d
5 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/shipments_controller.php
View file

@ -236,15 +236,14 @@ class ShipmentsController extends AppController {
function delete($id = null) { function delete($id = null) {
if (!$id) { $this->layout = 'ajax';
$this->Session->setFlash(__('Invalid id for Shipment', true)); if ($this->Shipment->del($id)) {
$this->redirect(array('action'=>'index')); return "Deleted"; // This should be returning status codes
} }
if ($this->Shipment->del($id)) { else {
$this->Session->setFlash(__('Shipment deleted', true)); return "Fail"; //All over the app.
$this->redirect(array('action'=>'index')); }
}
} }
@ -470,4 +469,4 @@ class ShipmentsController extends AppController {
} }
} }
?> ?>

4
app/views/elements/shipment_index_all.ctp
View file

@ -34,6 +34,8 @@
<tr> <tr>
<td class="actions"> <td class="actions">
<button id="<?=$shipment['Shipment']['id']?>" class="editButton">Edit</button> <button id="<?=$shipment['Shipment']['id']?>" class="editButton">Edit</button>
<button class="deleteButton">Delete</button>
</td> </td>
<td> <td>
<?php <?php
@ -189,4 +191,4 @@
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<?php debug($currencies); ?> <?php debug($currencies); ?>

0
app/views/shipments/delete.ctp Normal file
View file

5
app/webroot/css/quotenik.css
View file

@ -1677,3 +1677,8 @@ ul.document-buttons {
ul.document-buttons li { ul.document-buttons li {
padding: 0.5em; padding: 0.5em;
} }
.deleteButton {
display: block;
clear: both;
}

30
app/webroot/js/shipment_index.js
View file

@ -66,7 +66,8 @@ $(function() {
$( ".newShipment" ).button().click(function() { $( ".newShipment" ).button().click(function() {
$.get('/shipments/add/', false, function(data) {
$.get('/shipments/add/', false, function(data) {
$("#add-form").html(data); $("#add-form").html(data);
$( "#add-form" ).dialog( "open" ); $( "#add-form" ).dialog( "open" );
@ -79,19 +80,26 @@ $(function() {
$(".editButton").button().click(function() { $(".editButton").button().click(function() {
var id = $(this).attr('id'); var id = $(this).attr('id');
$.get('/shipments/edit/'+id, false, function(data) {
$.get('/shipments/edit/'+id, false, function(data) { $("#edit-form").html(data);
$( "#edit-form" ).dialog( "open" );
$("#edit-form").html(data); } );
$( "#edit-form" ).dialog( "open" );
} );
}); });
$(".deleteButton").click(function() {
var id = $(this).prev().attr('id');
var confirmed = confirm("Permanently delete this shipment?");
if(confirmed) {
$.get('/shipments/delete/'+id, false, function() {
window.location.reload();
});
}
});
@ -101,4 +109,4 @@ $(function() {
}); });