Merge remote-tracking branch 'origin/xodud1202' into develop

src/main/webapp/WEB-INF/views/order/OrderSellerDelvEndListForm.html

@@ -181,9 +181,30 @@ var columnDefs = [
 	{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
-	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-center'},
 	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-center'}
 ];

src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -171,9 +171,30 @@ var columnDefs = [
 	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
-	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'