This commit is contained in:
cimenmus
2018-02-09 00:25:16 +03:00
parent 104c8a98c9
commit d100fdf6d2
3 changed files with 15 additions and 1 deletions

2
.idea/misc.xml generated
View File

@@ -24,7 +24,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@@ -34,6 +34,7 @@ public class CreateOrderActivity extends BaseActivity {
private Boolean slicePizza; private Boolean slicePizza;
private String orderNote; private String orderNote;
private String discountAmount; private String discountAmount;
private String couponCode;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -207,4 +208,12 @@ public class CreateOrderActivity extends BaseActivity {
public void setDiscountAmount(String discountAmount) { public void setDiscountAmount(String discountAmount) {
this.discountAmount = discountAmount; this.discountAmount = discountAmount;
} }
public String getCouponCode() {
return couponCode;
}
public void setCouponCode(String couponCode) {
this.couponCode = couponCode;
}
} }

View File

@@ -94,6 +94,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
createOrderActivity.onNextClicked(FRAGMENT_NAME); createOrderActivity.onNextClicked(FRAGMENT_NAME);
} }
else { else {
createOrderActivity.setCouponCode(couponCodePizzalinkEditText.getText());
checkCoupon(); checkCoupon();
} }
@@ -104,6 +105,10 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
} }
private void initViews(){ private void initViews(){
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
if(createOrderActivity.getCouponCode() != null){
couponCodePizzalinkEditText.setText(createOrderActivity.getCouponCode());
}
initRecyclerView(); initRecyclerView();
} }