Skip to content

PA-405 : add partial and exact transactions #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PA-405 : add partial and exact transactions #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 182 additions & 2 deletions samplepaymenthooks/src/main/java/com/poynt/samples/paymenthooks/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@
import android.view.View;
import android.widget.Button;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

import co.poynt.api.model.CustomFundingSource;
import co.poynt.api.model.CustomFundingSourceType;
import co.poynt.api.model.FundingSource;
import co.poynt.api.model.FundingSourceType;
import co.poynt.api.model.Order;
import co.poynt.api.model.OrderItem;
import co.poynt.api.model.OrderItemStatus;
import co.poynt.api.model.Processor;
import co.poynt.api.model.ProcessorResponse;
import co.poynt.api.model.ProcessorStatus;
import co.poynt.api.model.Transaction;
import co.poynt.api.model.TransactionAction;
import co.poynt.api.model.TransactionAmounts;
import co.poynt.api.model.TransactionReference;
import co.poynt.api.model.TransactionReferenceType;
import co.poynt.api.model.TransactionStatus;
import co.poynt.os.Constants;
import co.poynt.os.model.Intents;
import co.poynt.os.model.Payment;
Expand All @@ -15,7 +37,7 @@ public class MainActivity extends Activity {

private static final String TAG = MainActivity.class.getSimpleName();

Payment payment;
private Payment payment;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -26,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
setNewAmount.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
payment.setAmount(100);
payment.setAmount(payment.getAmount() / 2);

Intent result = new Intent(Intents.ACTION_PROCESS_PAYMENT_HOOK_RESULT);
result.putExtra(Constants.HooksExtras.PAYMENT, payment);
Expand Down Expand Up @@ -56,6 +78,164 @@ public void onClick(View v) {
}
});

/** ADD PROMO ITEM TO PAYMENT
* This method adds a promo item to the order
* The following may happen depending on the order
* - If order exists an order item is added and the amounts are updated
* - If order does not exist then the amount needs to be incremented and item info is added to references
* */
//TODO: bind to a service to save Order. check other samples for a reference
Button addTransaction = (Button) findViewById(R.id.addOrder);
addTransaction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Order order = payment.getOrder();
if (order != null) {
List<OrderItem> orderItems = order.getItems();
if (orderItems == null) {
orderItems = new ArrayList<OrderItem>();
}
OrderItem promoItem = new OrderItem();
promoItem.setUnitPrice(100L);
promoItem.setQuantity(1.0F);
promoItem.setName("Fivestars promo");
promoItem.setId(123456);
promoItem.setStatus(OrderItemStatus.FULFILLED);
orderItems.add(promoItem);
order.setItems(orderItems);
order.getAmounts().setNetTotal(order.getAmounts().getNetTotal() + 100L);
} else {
List<TransactionReference> references = payment.getReferences();
if (references == null) {
references = new ArrayList<>();
}
TransactionReference reference = new TransactionReference();
reference.setId("promoitemreference1");
reference.setCustomType("PROMO_REFERENCE");
reference.setType(TransactionReferenceType.CUSTOM);
references.add(reference);
payment.setReferences(references);
payment.setNotes((payment.getNotes() != null ? payment.getNotes() + "\n" : "") + "$1 promo item added");
}
payment.setAmount(payment.getAmount() + 100L);
Intent result = new Intent(Intents.ACTION_PROCESS_PAYMENT_HOOK_RESULT);
result.putExtra(Constants.HooksExtras.PAYMENT, payment);
setResult(Activity.RESULT_OK, result);
finish();
}
});

/** REDEEM LOYALTY ITEM
* Redeems a loyalty item
* A new transaction is created for the redemption item
* */
Button add1Transaction = (Button) findViewById(R.id.add1Transaction);
add1Transaction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// why not create an order for loyalty redemption?
Transaction transaction = new Transaction();

long amount = payment.getAmount() / 2;

TransactionAmounts ta = new TransactionAmounts();
ta.setTransactionAmount(amount);
ta.setOrderAmount(amount);
ta.setCurrency("USD");
transaction.setAmounts(ta);

CustomFundingSource customFundingSource = new CustomFundingSource();
customFundingSource.setAccountId("1234567890");
customFundingSource.setType(CustomFundingSourceType.REWARD);
customFundingSource.setName("FIVESTARS");
customFundingSource.setProvider("FIVESTARS");
customFundingSource.setProcessor("Poynt");

FundingSource fs = new FundingSource();
fs.setType(FundingSourceType.CUSTOM_FUNDING_SOURCE);
fs.setCustomFundingSource(customFundingSource);
transaction.setFundingSource(fs);

transaction.setStatus(TransactionStatus.CAPTURED);
transaction.setAction(TransactionAction.SALE);
transaction.setSettled(true);

transaction.setId(UUID.randomUUID());
transaction.setCreatedAt(Calendar.getInstance());
transaction.setUpdatedAt(Calendar.getInstance());

ProcessorResponse processorResponse = new ProcessorResponse();
processorResponse.setProcessor(Processor.CREDITCALL);
processorResponse.setAcquirer(Processor.CHASE_PAYMENTECH);
processorResponse.setStatus(ProcessorStatus.Successful);
processorResponse.setApprovalCode("123456");
processorResponse.setStatusCode("200");
processorResponse.setApprovedAmount(transaction.getAmounts().getTransactionAmount());
processorResponse.setStatusMessage("Approved");

transaction.setProcessorResponse(processorResponse);

payment.setTransactions(Collections.singletonList(transaction));
Intent result = new Intent(Intents.ACTION_PROCESS_PAYMENT_HOOK_RESULT);
result.putExtra(Constants.HooksExtras.PAYMENT, payment);
setResult(Activity.RESULT_OK, result);
finish();
}
});

Button addExactTransaction = (Button) findViewById(R.id.addExactTransaction);
addExactTransaction.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// why not create an order for loyalty redemption?
Transaction transaction = new Transaction();

TransactionAmounts ta = new TransactionAmounts();
ta.setTransactionAmount(payment.getAmount());
ta.setOrderAmount(payment.getAmount());
ta.setCurrency("USD");
transaction.setAmounts(ta);

CustomFundingSource customFundingSource = new CustomFundingSource();
customFundingSource.setAccountId("1234567890");
customFundingSource.setType(CustomFundingSourceType.OTHER);
customFundingSource.setName("FIVESTARS");
customFundingSource.setProvider("poynt");
customFundingSource.setProcessor("Poynt");

FundingSource fs = new FundingSource();
fs.setType(FundingSourceType.CUSTOM_FUNDING_SOURCE);
fs.setCustomFundingSource(customFundingSource);
transaction.setFundingSource(fs);

transaction.setStatus(TransactionStatus.CAPTURED);
transaction.setAction(TransactionAction.SALE);
transaction.setSettled(true);

transaction.setId(UUID.randomUUID());
transaction.setCreatedAt(Calendar.getInstance());
transaction.setUpdatedAt(Calendar.getInstance());

ProcessorResponse processorResponse = new ProcessorResponse();
processorResponse.setProcessor(Processor.CREDITCALL);
processorResponse.setAcquirer(Processor.CHASE_PAYMENTECH);
processorResponse.setStatus(ProcessorStatus.Successful);
processorResponse.setApprovalCode("123456");
processorResponse.setStatusCode("200");
processorResponse.setApprovedAmount(transaction.getAmounts().getTransactionAmount());
processorResponse.setStatusMessage("Approved");

transaction.setProcessorResponse(processorResponse);

payment.setTransactions(Collections.singletonList(transaction));

Intent result = new Intent(Intents.ACTION_PROCESS_PAYMENT_HOOK_RESULT);
result.putExtra(Constants.HooksExtras.PAYMENT, payment);
setResult(Activity.RESULT_OK, result);
finish();
}
});

// Get the intent that started this activity
Intent intent = getIntent();
if (intent != null) {
Expand Down
8 changes: 8 additions & 0 deletions ...epaymenthooks/src/main/java/com/poynt/samples/paymenthooks/SamplePaymentHooksService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ public void onEvent(@PaymentHookEvent.Type String s, Payment payment, Transactio
intent.putExtra(Constants.HooksExtras.TRANSACTION, transaction);

listener.onLaunchActivity(intent);
} else if (PaymentHookEvent.PAYMENT_VOIDED.equals(s)) {
payment.setAmount(payment.getAmount() - 10);
Log.d(TAG, "updated payment amount");
listener.updatePayment(payment);
} else if (PaymentHookEvent.PAYMENT_REFUNDED.equals(s)) {
payment.setAmount(payment.getAmount() - 20);
Log.d(TAG, "updated payment amount");
listener.updatePayment(payment);
} else {
listener.onContinue();
}
Expand Down
32 changes: 31 additions & 1 deletion samplepaymenthooks/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:layout_margin="10dp"
android:textSize="20sp"
android:padding="10dp"
android:text="Set $1 amount" />
android:text="Fail with lower amount" />

<Button
android:id="@+id/noChanges"
Expand All @@ -43,4 +43,34 @@
android:padding="10dp"
android:text="Exit without returning payment object"/>

<Button
android:id="@+id/addOrder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_background_color"
android:layout_margin="10dp"
android:textSize="20sp"
android:padding="10dp"
android:text="Add order"/>

<Button
android:id="@+id/add1Transaction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_background_color"
android:layout_margin="10dp"
android:textSize="20sp"
android:padding="10dp"
android:text="Add 1 transaction"/>

<Button
android:id="@+id/addExactTransaction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_background_color"
android:layout_margin="10dp"
android:textSize="20sp"
android:padding="10dp"
android:text="Add same amount transaction"/>

</LinearLayout>