Merge remote-tracking branch 'origin/master'

src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java

@@ -1298,7 +1298,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                 row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("total_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("total_charge").toPlainString());
                 row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("royalpay_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("royalpay_charge").toPlainString());
                 row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("net_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("net_charge").toPlainString());
-                row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("org_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("org_charge").toPlainString());
+                if (log.getBigDecimal("org_charge").compareTo(BigDecimal.ZERO) == 1) {
+                    row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("org_charge").toPlainString());
+                }else {
+                    row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(BigDecimal.ZERO.toPlainString());
+                }
                 row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("share_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("share_charge").toPlainString());
                 row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(type);
             }

src/main/ui/static/config/orgcommission/templates/org_commission_month.html

@@ -77,7 +77,12 @@
                         </span>
                     </td>
                     <td ng-if="log.org_type=='agent' || log.share_charge ==0">
-                            {{log.org_charge}}
+                        <span ng-if="log.org_charge>0">
+                            {{log.org_charge|currency:'AUD'}}
+                        </span>
+                        <span ng-if="log.org_charge<=0">
+                            {{0|currency:'AUD'}}
+                        </span>
                     </td>
 
                     <td ng-bind="log.share_charge"></td>