Rectified the issue

mshanu · Mar 9, 2011 · 994ba15 · 994ba15
1 parent 18562e6
commit 994ba15
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy
@@ -14,15 +14,15 @@ environments {
     development {
         dataSource {
             dbCreate = "update"
-            url = "jdbc:postgresql://localhost:5432/GIFTDB"
+            url = "jdbc:postgresql://localhost:5432/vmsdb"
             username = "app_user"
             password = "password"
         }
     }
     test {
         dataSource {
             dbCreate = "update"
-            url = "jdbc:postgresql://localhost:5432/GIFTDB"
+            url = "jdbc:postgresql://localhost:5432/vmsdb"
             username = "app_user"
             password = "password"
         }

diff --git a/grails-app/controllers/com/breigns/vms/controller/VoucherController.groovy b/grails-app/controllers/com/breigns/vms/controller/VoucherController.groovy
@@ -32,7 +32,7 @@ class VoucherController {
     def sequenceNumber = params['sequenceNumber'] ? Long.parseLong(params['sequenceNumber']) : null
     def voucher = voucherService.getVoucherToValidateAndUpdateStatus(params['clientInitials'], sequenceNumber, params['barcode'])
     if (voucher) {
-      def converter = voucher as JSON
+      def converter = voucher.getVoucherModel() as JSON
       converter.render(response)
     } else {
       render 'FAILURE'

diff --git a/grails-app/domain/com/breigns/vms/Voucher.groovy b/grails-app/domain/com/breigns/vms/Voucher.groovy
@@ -28,4 +28,9 @@ class Voucher {
   def getDiscountGivenForReport() {
     voucherRequest.voucherInvoice.discount
   }
+
+  def getVoucherModel(){
+    return new VoucherModel(sequenceNumber:sequenceNumber,barcodeAlpha:barcodeAlpha,value:value,
+            validThru:validThru,client:voucherRequest.client)
+  }
 }
diff --git a/grails-app/views/voucher/invoiceEntry.gsp b/grails-app/views/voucher/invoiceEntry.gsp
@@ -65,7 +65,7 @@ h3 {
               if (data != 'FAILURE') {
 
                 if ($("#voucherId").length == 0 || !isVoucherAlreadyPresent('voucherId', data.id)) {
-                  $('#voucherTable tr:last').after('<tr><td><input type="hidden" id="voucherId" name="voucherId" value="' + data.id + '"/>' + data.sequenceNumber + '</td><td>' + data.barcodeAlpha + '</td><td>' + data.voucherRequest.client.name + '</td><td>' + data.value + '</td><td><input type="button" value="X"></td></tr>')
+                  $('#voucherTable tr:last').after('<tr><td><input type="hidden" id="voucherId" name="voucherId" value="' + data.id + '"/>' + data.sequenceNumber + '</td><td>' + data.barcodeAlpha + '</td><td>' + data.client.name + '</td><td>' + data.value + '</td><td><input type="button" value="X"></td></tr>')
                   bindRemoveClickHandlerForTableRow('voucherTable')
                   $.each(["barcode","clientInitials","voucherSequenceNumber"], function(index, value) {
                     $('#' + value).val("")

diff --git a/src/groovy/com/breigns/vms/VoucherModel.groovy b/src/groovy/com/breigns/vms/VoucherModel.groovy
@@ -0,0 +1,10 @@
+package com.breigns.vms
+
+class VoucherModel {
+  Integer sequenceNumber
+  String barcodeAlpha
+  Double value
+  Shop validatedAt;
+  Date validThru;
+  Client client
+}