-
Notifications
You must be signed in to change notification settings - Fork 35
enable/disable receipt payment #171
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.
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
rMozg
wants to merge
4
commits into
evotor:develop
Choose a base branch
from
rMozg:alco_schedule
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
...or/framework/core/action/event/receipt/ready_for_payment/ReceiptReadyForPaymentEvent.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package ru.evotor.framework.core.action.event.receipt.ready_for_payment; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.support.annotation.NonNull; | ||
| import android.support.annotation.Nullable; | ||
|
|
||
| import ru.evotor.IBundlable; | ||
|
|
||
| public class ReceiptReadyForPaymentEvent implements IBundlable { | ||
|
|
||
| public static final String NAME_PERMISSION = "evo.v2.receipt.payment.DISABLE"; | ||
|
|
||
| public static final String NAME_SELL_RECEIPT = "evo.v2.receipt.sell.receiptReadyForPayment"; | ||
| public static final String NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.receiptReadyForPayment"; | ||
| public static final String NAME_BUY_RECEIPT = "evo.v2.receipt.buy.receiptReadyForPayment"; | ||
| public static final String NAME_BUYBACK_RECEIPT = "evo.v2.receipt.buyback.receiptReadyForPayment"; | ||
|
|
||
| private static final String KEY_RECEIPT_UUID = "receiptUuid"; | ||
|
|
||
| @Nullable | ||
| public static ReceiptReadyForPaymentEvent create(@Nullable Bundle bundle) { | ||
| if (bundle == null) { | ||
| return null; | ||
| } | ||
| String receiptUuid = bundle.getString(KEY_RECEIPT_UUID, null); | ||
| return new ReceiptReadyForPaymentEvent(receiptUuid); | ||
| } | ||
|
|
||
| @NonNull | ||
| private final String receiptUuid; | ||
|
|
||
| @NonNull | ||
| public String getReceiptUuid() { | ||
| return receiptUuid; | ||
| } | ||
|
|
||
| public ReceiptReadyForPaymentEvent(@NonNull String receiptUuid) { | ||
| this.receiptUuid = receiptUuid; | ||
| } | ||
|
|
||
| @NonNull | ||
| public Bundle toBundle() { | ||
| Bundle result = new Bundle(); | ||
| result.putString(KEY_RECEIPT_UUID, receiptUuid); | ||
| return result; | ||
| } | ||
|
|
||
| } |
23 changes: 23 additions & 0 deletions
23
...ork/core/action/event/receipt/ready_for_payment/ReceiptReadyForPaymentEventProcessor.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package ru.evotor.framework.core.action.event.receipt.ready_for_payment; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.support.annotation.NonNull; | ||
| import android.support.annotation.Nullable; | ||
|
|
||
| import ru.evotor.framework.core.action.processor.ActionProcessor; | ||
|
|
||
| public abstract class ReceiptReadyForPaymentEventProcessor extends ActionProcessor { | ||
| @Override | ||
| public void process(@NonNull String action, @Nullable Bundle bundle, @NonNull Callback callback) { | ||
| ReceiptReadyForPaymentEvent event = ReceiptReadyForPaymentEvent.create(bundle); | ||
| if (event == null) { | ||
| return; | ||
| } | ||
| call(action, event, callback); | ||
| } | ||
|
|
||
| public abstract void call(@NonNull String action, | ||
| @NonNull ReceiptReadyForPaymentEvent event, | ||
| @NonNull Callback callback); | ||
| } | ||
|
|
||
39 changes: 39 additions & 0 deletions
39
...mework/core/action/event/receipt/ready_for_payment/ReceiptReadyForPaymentEventResult.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package ru.evotor.framework.core.action.event.receipt.ready_for_payment; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.support.annotation.NonNull; | ||
| import android.support.annotation.Nullable; | ||
|
|
||
| import ru.evotor.IBundlable; | ||
|
|
||
| public class ReceiptReadyForPaymentEventResult implements IBundlable { | ||
|
|
||
| private static final String KEY_RECEIPT_PAYMENT_ENABLED = "receiptPaymentEnabled"; | ||
|
|
||
| @Nullable | ||
| public static ReceiptReadyForPaymentEventResult create(@Nullable Bundle bundle) { | ||
| if (bundle == null) { | ||
| return null; | ||
| } | ||
| boolean sendUtmDocEnabled = bundle.getBoolean(KEY_RECEIPT_PAYMENT_ENABLED); | ||
|
|
||
| return new ReceiptReadyForPaymentEventResult(sendUtmDocEnabled); | ||
| } | ||
|
|
||
| private final boolean receiptPaymentEnabled; | ||
|
|
||
| public ReceiptReadyForPaymentEventResult(boolean receiptPaymentEnabled) { | ||
| this.receiptPaymentEnabled = receiptPaymentEnabled; | ||
| } | ||
|
|
||
| @NonNull | ||
| public Bundle toBundle() { | ||
| Bundle bundle = new Bundle(); | ||
| bundle.putBoolean(KEY_RECEIPT_PAYMENT_ENABLED, receiptPaymentEnabled); | ||
| return bundle; | ||
| } | ||
|
|
||
| public boolean isReceiptPaymentEnabled() { | ||
| return receiptPaymentEnabled; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
если bundle == null, то сначала сделать callback.skip();