Skip to content

Commit

Permalink
Merge pull request #10982 from hmislk/development
Browse files Browse the repository at this point in the history 
upto date changes to coop test
  • Loading branch information
@ChinthakaPrasad
ChinthakaPrasad authored Mar 8, 2025
2 parents 4ffa08e + 105168a commit 5de9169
Show file tree
Hide file tree
Showing 28 changed files with 1,799 additions and 503 deletions.
6 changes: 5 additions & 1 deletion src/main/java/com/divudi/bean/cashTransaction/DrawerController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void updateDrawer(Payment payment, double paidValue, WebUser webUser) {
}

//update Drover History
drawerEntryUpdate(payment, drawer);
drawerEntryUpdate(payment, drawer, webUser);

synchronized (drawer) {
switch (payment.getPaymentMethod()) {
Expand Down Expand Up @@ -221,6 +221,10 @@ public void drawerEntryUpdate(Payment payment, Drawer currentDrawer) {
drawerService.drawerEntryUpdate(payment, currentDrawer);
}

public void drawerEntryUpdate(Payment payment, Drawer currentDrawer, WebUser user) {
drawerService.drawerEntryUpdate(payment, currentDrawer, user);
}

public void updateDrawerForOuts(List<Payment> payments) {
drawerService.updateDrawerForOuts(payments);
}
Expand Down
71 changes: 67 additions & 4 deletions src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ public class FinancialTransactionController implements Serializable {
private DenominationTransaction dt;
private double totalCashFund;

boolean floatTransferStarted = false;

// </editor-fold>
// <editor-fold defaultstate="collapsed" desc="Constructors">
public FinancialTransactionController() {
Expand Down Expand Up @@ -1230,6 +1232,7 @@ public String navigateBackToPaymentHandoverAccept() {
public String navigateToFundTransferBill() {
resetClassVariables();
prepareToAddNewFundTransferBill();
floatTransferStarted = false;
return "/cashier/fund_transfer_bill?faces-redirect=true";
}

Expand Down Expand Up @@ -1654,6 +1657,7 @@ public String navigateToCashierSummaryBreakdownFromShiftClosing(List<PaymentMeth
return "/analytics/shift_end_summary_breakdown?faces-redirect=true";
}

@Deprecated
public String navigateToReceiveNewFundTransferBill() {
if (selectedBill == null) {
JsfUtil.addErrorMessage("Please select a bill");
Expand All @@ -1665,6 +1669,23 @@ public String navigateToReceiveNewFundTransferBill() {
}
resetClassVariablesWithoutSelectedBill();
prepareToAddNewFundTransferReceiveBill();
floatTransferStarted = false;
return "/cashier/fund_transfer_receive_bill?faces-redirect=true";
}

public String navigateToReceiveFloatTransferForMe(Bill bill) {
if (bill == null) {
JsfUtil.addErrorMessage("Please select a bill");
return "";
}
if (bill.getBillType() != BillType.FundTransferBill) {
JsfUtil.addErrorMessage("Wrong Bill Type");
return "";
}
floatTransferStarted = false;
setSelectedBill(bill);
resetClassVariablesWithoutSelectedBill();
prepareToAddNewFundTransferReceiveBill();
return "/cashier/fund_transfer_receive_bill?faces-redirect=true";
}

Expand Down Expand Up @@ -2305,18 +2326,28 @@ public String settleExpensesBill() {
}

public String settleFundTransferBill() {
if (floatTransferStarted) {
JsfUtil.addErrorMessage("Already Started");
return "";
} else {
floatTransferStarted = true;
}
if (currentBill == null) {
floatTransferStarted = false;
JsfUtil.addErrorMessage("Error");
return "";
}
if (currentBill.getBillType() != BillType.FundTransferBill) {
floatTransferStarted = false;
JsfUtil.addErrorMessage("Error");
return "";
}
if (currentBill.getToWebUser() == null) {
floatTransferStarted = false;
JsfUtil.addErrorMessage("Select to whom to transfer");
return "";
}
String deptId = billNumberGenerator.departmentBillNumberGeneratorYearly(sessionController.getDepartment(), BillTypeAtomic.FUND_TRANSFER_BILL);
currentBill.setToStaff(currentBill.getToWebUser().getStaff());
currentBill.setDepartment(sessionController.getDepartment());
currentBill.setInstitution(sessionController.getInstitution());
Expand All @@ -2325,22 +2356,35 @@ public String settleFundTransferBill() {
currentBill.setFromWebUser(sessionController.getLoggedUser());
currentBill.setBillDate(new Date());
currentBill.setBillTime(new Date());
currentBill.setDeptId(deptId);
currentBill.setInsId(deptId);

billController.save(currentBill);
double billTotal = 0.0;
for (Payment p : getCurrentBillPayments()) {
System.out.println("p = " + p);
p.setBill(currentBill);
p.setCreatedAt(new Date());
p.setCreater(sessionController.getLoggedUser());
p.setInstitution(null);
p.setDepartment(null);
p.setPaidValue(0 - Math.abs(p.getPaidValue()));
billTotal += p.getPaidValue();
paymentController.save(p);

drawerController.updateDrawerForOuts(p);
}

currentBill.setTotal(billTotal);
currentBill.setNetTotal(billTotal);
currentBill.setDiscount(0.0);
currentBill.setTax(0.0);
currentBill.setBalance(billTotal);
billController.save(currentBill);
currentBill.getPayments().addAll(currentBillPayments);
System.out.println("currentBillPayments = " + currentBillPayments);
billController.save(currentBill);
System.out.println("currentBill.getPayments() = " + currentBill.getPayments());
floatTransferStarted = false;
return "/cashier/fund_transfer_bill_print?faces-redirect=true";
}

Expand Down Expand Up @@ -4843,22 +4887,32 @@ public List<Bill> findHandoverCompletionBills(ReportTemplateRow row) {
}

public String settleFundTransferReceiveBill() {
if (floatTransferStarted) {
JsfUtil.addErrorMessage("Error");
return "";
} else {
floatTransferStarted = true;
}
if (currentBill == null) {
JsfUtil.addErrorMessage("Error");
floatTransferStarted = false;
return "";
}

if (currentBill.getReferenceBill() == null) {
JsfUtil.addErrorMessage("Error");
floatTransferStarted = false;
return "";
}

if (currentBill.getBillType() != BillType.FundTransferReceivedBill) {
JsfUtil.addErrorMessage("Error - bill type");
floatTransferStarted = false;
return "";
}

if (currentBill.getReferenceBill().getBillType() != BillType.FundTransferBill) {
floatTransferStarted = false;
JsfUtil.addErrorMessage("Error - Reference bill type");
return "";
}
Expand All @@ -4868,21 +4922,30 @@ public String settleFundTransferReceiveBill() {
currentBill.setStaff(sessionController.getLoggedUser().getStaff());
currentBill.setToStaff(sessionController.getLoggedUser().getStaff());
currentBill.setFromStaff(currentBill.getReferenceBill().getFromStaff());
String deptId = billNumberGenerator.departmentBillNumberGeneratorYearly(sessionController.getDepartment(), BillTypeAtomic.FUND_TRANSFER_RECEIVED_BILL);
currentBill.setDeptId(deptId);
currentBill.setInsId(deptId);
billController.save(currentBill);
double totalValue = 0.0;
for (Payment p : currentBillPayments) {
System.out.println("p = " + p);
p.setBill(currentBill);
p.setCurrentHolder(sessionController.getLoggedUser());
p.setDepartment(null);
p.setInstitution(null);
p.setPaidValue(Math.abs(p.getPaidValue()));
totalValue += p.getPaidValue();
paymentController.save(p);
drawerController.updateDrawerForIns(p, sessionController.getLoggedUser());
}

drawerController.updateDrawerForIns(currentBillPayments);

currentBill.setTotal(totalValue);
currentBill.setNetTotal(totalValue);
currentBill.setDiscount(0);
currentBill.getPayments().addAll(currentBillPayments);
currentBill.getReferenceBill().setReferenceBill(currentBill);
billController.save(currentBill.getReferenceBill());

floatTransferStarted = false;
return "/cashier/fund_transfer_receive_bill_print?faces-redirect=true";
}

Expand Down
Loading

0 comments on commit 5de9169

Please sign in to comment.