| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
public void makePayment(Client client, BigDecimal amount)
throws PaymentServiceException {
initIfRequired();
=======
private StkMenu getMpesaMenu() throws PaymentServiceException {
try {
StkResponse stkResponse = cService.stkRequest(StkRequest.GET_ROOT_MENU);
StkMenu rootMenu = null;
if (stkResponse instanceof StkMenu) {
rootMenu = (StkMenu) stkResponse;
}else{
throw new PaymentServiceException("StkResponse Error Returned.");
}
return (StkMenu)cService.stkRequest(rootMenu.getRequest("M-PESA"));
} catch (SMSLibDeviceException ex) {
throw new PaymentServiceException(ex);
} catch (IOException e) {
throw new PaymentServiceException(e);
}
}
public void makePayment(Client client, BigDecimal amount)
throws PaymentServiceException {
>>>>>>> 753eaf3fb42dee86a013b1c962736a505ac44598
try {
StkMenu mPesaMenu = getMpesaMenu();
StkResponse sendMoneyResponse = cService.stkRequest(mPesaMenu.getRequest("Send money")); |
| Solution content |
|---|
}
}
public void makePayment(Client client, BigDecimal amount)
throws PaymentServiceException {
initIfRequired();
try {
StkMenu mPesaMenu = getMpesaMenu();
StkResponse sendMoneyResponse = cService.stkRequest(mPesaMenu.getRequest("Send money")); |
| File |
|---|
| MpesaPaymentService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public void showSendNewPaymentsAuthDialog() {
// get the correct payment service in the paymentServices list
<<<<<<< HEAD
if(pluginController.getPaymentService() == null) {
ui.infoMessage("There is no payment service configured.");
=======
if (!pluginController.getPaymentServices().isEmpty()){
int itemPaymentServices=0;
boolean flag = false;
opMobilePaymentSystem = ((PaymentService.PaymentServiceType) ui.getAttachedObject(ui.getSelectedItem(cmbOpMobilePaymentSystem))).getType();
System.out.println("payment service combobox:" + ((PaymentService.PaymentServiceType) ui.getAttachedObject(ui.getSelectedItem(cmbOpMobilePaymentSystem))).getType());
//to pick up the right paymentService from the list initialised in enterPin.java
while(!flag && itemPaymentServices |
| Solution content |
|---|
public void showSendNewPaymentsAuthDialog() {
// get the correct payment service in the paymentServices list
if(pluginController.getPaymentService() == null) {
ui.infoMessage("There is no payment service configured.");
} else {
OutgoingPayment payment = createOutgoingPaymentFromDialogFields();
ui.add(new SendPaymentAuthDialogHandler(ui, pluginController, payment, pluginController.getPaymentService()).getDialog()); |
| File |
|---|
| SendNewPaymentDialogHandler.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| If statement |
| Method invocation |
| Variable |
| While statement |
| Chunk |
|---|
| Conflicting content |
|---|
"yohan mwenyewe alibamba", "3/5/11 8:35 PM");
}
<<<<<<< HEAD
public void testOutgoingPaymentProcessing() {
testOutgoingPaymentProcessing("BC77RI604 Confirmed.\n" +
"Ksh1,235 sent to DACON OMONDI 254723908001 on 22/5/11 at 10:35 PM\n" +
"New M-PESA balance is Ksh1,236",
PHONENUMBER_1, ACCOUNTNUMBER_1_1, "1235", "BC77RI604",
"DACON OMONDI", "22/5/11 10:35 PM", OutgoingPayment.Status.CONFIRMED);
}
=======
>>>>>>> 753eaf3fb42dee86a013b1c962736a505ac44598
@Override
String[] getValidMessagesText() {
return new String[] { |
| Solution content |
|---|
"yohan mwenyewe alibamba", "3/5/11 8:35 PM");
}
@Override
String[] getValidMessagesText() {
return new String[] { |
| File |
|---|
| MpesaStandardServiceTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |