Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meser
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Suryono
meser
Commits
88b22e86
Commit
88b22e86
authored
Aug 31, 2020
by
Alfansyah Fadlian
Browse files
Options
Browse Files
Download
Plain Diff
check from dev
parents
c42e1c0b
11ad115d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
193 additions
and
133 deletions
+193
-133
BottomSheets.java
app/src/main/java/com/yono/messeripos/BottomSheets.java
+39
-8
PaymentActivity.java
app/src/main/java/com/yono/messeripos/PaymentActivity.java
+149
-123
activity_q_r_code.xml
app/src/main/res/layout/activity_q_r_code.xml
+3
-0
item_category.xml
app/src/main/res/layout/item_category.xml
+2
-2
No files found.
app/src/main/java/com/yono/messeripos/BottomSheets.java
View file @
88b22e86
...
@@ -47,7 +47,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -47,7 +47,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
Utils
utils
;
Utils
utils
;
String
defaultText
=
"0"
;
String
defaultText
=
"0"
;
Client
client
=
new
Client
();
Client
client
=
new
Client
();
public
static
long
grossAmount
,
result
,
inpu
t
;
public
static
long
grossAmount
,
input
,
resul
t
;
SharedPreferences
sharedPreferences
;
SharedPreferences
sharedPreferences
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
RelativeLayout
layoutFormCash
;
RelativeLayout
layoutFormCash
;
...
@@ -82,6 +82,12 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -82,6 +82,12 @@ public class BottomSheets extends BottomSheetDialogFragment {
btnCash
=
v
.
findViewById
(
R
.
id
.
btnCash
);
btnCash
=
v
.
findViewById
(
R
.
id
.
btnCash
);
totalHarga
=
v
.
findViewById
(
R
.
id
.
totalHarga
);
totalHarga
=
v
.
findViewById
(
R
.
id
.
totalHarga
);
utils
=
new
Utils
();
utils
=
new
Utils
();
<<<<<<<
HEAD
=======
btnCash
.
setEnabled
(
false
);
>>>>>>>
11
ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
// bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
// bottomSheetBehavior = BottomSheetBehavior.from(layoutFormCash);
sharedPreferences
=
getActivity
().
getSharedPreferences
(
MainActivity
.
MY_SHARED_PREFERENCES
,
Context
.
MODE_PRIVATE
);
sharedPreferences
=
getActivity
().
getSharedPreferences
(
MainActivity
.
MY_SHARED_PREFERENCES
,
Context
.
MODE_PRIVATE
);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
...
@@ -127,14 +133,19 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -127,14 +133,19 @@ public class BottomSheets extends BottomSheetDialogFragment {
@Override
@Override
public
void
onTextChanged
(
CharSequence
charSequence
,
int
i
,
int
i1
,
int
i2
)
{
public
void
onTextChanged
(
CharSequence
charSequence
,
int
i
,
int
i1
,
int
i2
)
{
if
(
TextUtils
.
isEmpty
(
charSequence
))
inputAmount
.
setText
(
""
);
if
(
TextUtils
.
isEmpty
(
charSequence
))
inputAmount
.
setText
(
"
0
"
);
grossAmount
=
paymentsModels
.
getGrossAmount
();
grossAmount
=
paymentsModels
.
getGrossAmount
();
input
=
Long
.
parseLong
(
inputAmount
.
getText
().
toString
());
input
=
Long
.
parseLong
(
inputAmount
.
getText
().
toString
());
result
=
input
-
grossAmount
;
result
=
input
-
grossAmount
;
hargaChange
.
setText
(
utils
.
convertPrice
(
"Rp."
,
result
));
if
(
result
>
0
)
{
btnCash
.
setEnabled
(
true
);
}
else
{
btnCash
.
setEnabled
(
false
);
}
hargaChange
.
setText
(
utils
.
convertPrice
(
"Rp."
,
result
));
}
}
@Override
@Override
...
@@ -149,16 +160,17 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -149,16 +160,17 @@ public class BottomSheets extends BottomSheetDialogFragment {
}
}
private
void
bayar
(
View
view
)
{
private
void
bayar
(
View
view
)
{
// String orderId, String paymentType, String bank, long grossAmount
// String orderId, String paymentType, String bank, long grossAmount
PaymentsModels
paymentsModels
=
new
PaymentsModels
(
PaymentsModels
paymentsModels
=
new
PaymentsModels
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
),
sharedPreferences
.
getString
(
ORDER_ID
,
""
),
"cash"
,
"cash"
,
"none"
,
"none"
,
grossAmount
grossAmount
);
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
<<<<<<<
HEAD
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
@Override
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
...
@@ -176,9 +188,28 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -176,9 +188,28 @@ public class BottomSheets extends BottomSheetDialogFragment {
@Override
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Throwable
t
)
{
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Throwable
t
)
{
=======
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
>>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Response
<
DataResponse
<
PaymentsModels
>>
response
)
{
Log
.
i
(
"CASH"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
)
{
SharedPreferences
.
Editor
editor
=
PaymentActivity
.
sharedPreferences
.
edit
();
editor
.
putBoolean
(
CHECKOUT
,
false
);
editor
.
putString
(
ORDER_ID
,
""
);
if
(
editor
.
commit
())
{
Intent
i
=
new
Intent
(
getActivity
(),
MainActivity
.
class
);
view
.
getContext
().
startActivity
(
i
);
}
}
}
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Throwable
t
)
{
>>>>>>>
11
ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
}
}
});
});
}
}
}
}
app/src/main/java/com/yono/messeripos/PaymentActivity.java
View file @
88b22e86
...
@@ -46,6 +46,7 @@ import retrofit2.Call;
...
@@ -46,6 +46,7 @@ import retrofit2.Call;
import
retrofit2.Callback
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
import
retrofit2.Response
;
import
static
com
.
yono
.
messeripos
.
BottomSheets
.
bottomSheetBehavior
;
import
static
com
.
yono
.
messeripos
.
BottomSheets
.
grossAmount
;
import
static
com
.
yono
.
messeripos
.
BottomSheets
.
grossAmount
;
import
static
com
.
yono
.
messeripos
.
MainActivity
.
CHECKOUT
;
import
static
com
.
yono
.
messeripos
.
MainActivity
.
CHECKOUT
;
import
static
com
.
yono
.
messeripos
.
MainActivity
.
ORDER_ID
;
import
static
com
.
yono
.
messeripos
.
MainActivity
.
ORDER_ID
;
...
@@ -55,7 +56,7 @@ import static com.yono.messeripos.MainActivity.orderId;
...
@@ -55,7 +56,7 @@ import static com.yono.messeripos.MainActivity.orderId;
public
class
PaymentActivity
extends
AppCompatActivity
{
public
class
PaymentActivity
extends
AppCompatActivity
{
private
ArrayList
<
PaymentResponse
>
paymentResponses
=
new
ArrayList
<>();
private
ArrayList
<
PaymentResponse
>
paymentResponses
=
new
ArrayList
<>();
public
static
String
methodPay
=
""
;
public
static
String
methodPay
=
""
;
private
Button
btnPay
;
private
Button
btnPay
;
private
MainViewModelsCart
mainViewModels
;
private
MainViewModelsCart
mainViewModels
;
private
PaymentsModels
paymentsModels
;
private
PaymentsModels
paymentsModels
;
...
@@ -67,7 +68,6 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -67,7 +68,6 @@ public class PaymentActivity extends AppCompatActivity {
public
static
BottomSheets
bottomSheet
;
public
static
BottomSheets
bottomSheet
;
public
static
QRCode
qrCode
;
public
static
QRCode
qrCode
;
public
static
SharedPreferences
sharedPreferences
;
public
static
SharedPreferences
sharedPreferences
;
Button
cashBtn
;
ProgressDialog
progressDialog
;
ProgressDialog
progressDialog
;
BottomSheetBehavior
bottomSheetBank
;
BottomSheetBehavior
bottomSheetBank
;
RelativeLayout
qrcodeLayoutBank
;
RelativeLayout
qrcodeLayoutBank
;
...
@@ -79,7 +79,7 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -79,7 +79,7 @@ public class PaymentActivity extends AppCompatActivity {
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_payment
);
setContentView
(
R
.
layout
.
activity_payment
);
Log
.
i
(
"Status Checkout payment"
,
"onCreate: "
+
checkout
);
Log
.
i
(
"Status Checkout payment"
,
"onCreate: "
+
checkout
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
)
{
Window
w
=
getWindow
();
Window
w
=
getWindow
();
w
.
setFlags
(
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
,
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
);
w
.
setFlags
(
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
,
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
);
...
@@ -101,20 +101,20 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -101,20 +101,20 @@ public class PaymentActivity extends AppCompatActivity {
DividerItemDecoration
dividerItemDecoration
=
new
DividerItemDecoration
(
this
,
DividerItemDecoration
.
VERTICAL
);
DividerItemDecoration
dividerItemDecoration
=
new
DividerItemDecoration
(
this
,
DividerItemDecoration
.
VERTICAL
);
mainViewModels
=
new
ViewModelProvider
(
PaymentActivity
.
this
).
get
(
MainViewModelsCart
.
class
);
mainViewModels
=
new
ViewModelProvider
(
PaymentActivity
.
this
).
get
(
MainViewModelsCart
.
class
);
Log
.
i
(
"IN_HISTORY"
,
"onCreate: "
+
utils
.
convertGson
(
paymentsModelsIntent
));
Log
.
i
(
"IN_HISTORY"
,
"onCreate: "
+
utils
.
convertGson
(
paymentsModelsIntent
));
if
(
paymentsModelsIntent
==
null
){
if
(
paymentsModelsIntent
==
null
)
{
mainViewModels
.
getCartById
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
)).
observe
(
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
mainViewModels
.
getCartById
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
)).
observe
(
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
@Override
@Override
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
String
js
=
new
Gson
().
toJson
(
productCartModels
);
String
js
=
new
Gson
().
toJson
(
productCartModels
);
Log
.
i
(
"On payment"
,
"onChanged: "
+
js
);
Log
.
i
(
"On payment"
,
"onChanged: "
+
js
);
for
(
ProductCartModels
pd
:
productCartModels
){
for
(
ProductCartModels
pd
:
productCartModels
)
{
total
=
total
+
pd
.
getPrice_orders
()
*
pd
.
getQuantity_orders
();
total
=
total
+
pd
.
getPrice_orders
()
*
pd
.
getQuantity_orders
();
}
}
if
(
productCartModels
.
size
()
!=
0
)
{
if
(
productCartModels
.
size
()
!=
0
)
{
getSupportActionBar
().
setTitle
(
productCartModels
.
get
(
0
).
getId_orders
());
getSupportActionBar
().
setTitle
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setGrossAmount
(
total
);
paymentsModels
.
setGrossAmount
(
total
);
...
@@ -126,18 +126,18 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -126,18 +126,18 @@ public class PaymentActivity extends AppCompatActivity {
}
}
}
}
});
});
}
else
{
}
else
{
mainViewModels
.
getCartById
(
paymentsModelsIntent
.
getOrderId
()).
observe
(
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
mainViewModels
.
getCartById
(
paymentsModelsIntent
.
getOrderId
()).
observe
(
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
@Override
@Override
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
String
js
=
new
Gson
().
toJson
(
productCartModels
);
String
js
=
new
Gson
().
toJson
(
productCartModels
);
Log
.
i
(
"On Intent_CHANGE"
,
"onChanged: "
+
paymentsModels
.
getOrderId
());
Log
.
i
(
"On Intent_CHANGE"
,
"onChanged: "
+
paymentsModels
.
getOrderId
());
for
(
ProductCartModels
pd
:
productCartModels
){
for
(
ProductCartModels
pd
:
productCartModels
)
{
total
=
total
+
pd
.
getPrice_orders
()
*
pd
.
getQuantity_orders
();
total
=
total
+
pd
.
getPrice_orders
()
*
pd
.
getQuantity_orders
();
}
}
if
(
productCartModels
.
size
()
!=
0
){
if
(
productCartModels
.
size
()
!=
0
)
{
getSupportActionBar
().
setTitle
(
productCartModels
.
get
(
0
).
getId_orders
());
getSupportActionBar
().
setTitle
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setGrossAmount
(
total
);
paymentsModels
.
setGrossAmount
(
total
);
...
@@ -160,7 +160,7 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -160,7 +160,7 @@ public class PaymentActivity extends AppCompatActivity {
rvPayment
.
setLayoutManager
(
llm
);
rvPayment
.
setLayoutManager
(
llm
);
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/5c40mWX/cash-logo.png"
,
"cash"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/5c40mWX/cash-logo.png"
,
"cash"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/
XCsdmmT/Bank-Mandiri-logo.png"
,
"mandi
ri"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/
bNDJqyj/BANK-BRI-logo.png"
,
"b
ri"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/2n65nCT/bca-bank-central-asia.png"
,
"bca"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/2n65nCT/bca-bank-central-asia.png"
,
"bca"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/RjJQT9K/BNI-logo.png"
,
"bni"
));
paymentResponses
.
add
(
new
PaymentResponse
(
"https://i.ibb.co/RjJQT9K/BNI-logo.png"
,
"bni"
));
...
@@ -177,159 +177,185 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -177,159 +177,185 @@ public class PaymentActivity extends AppCompatActivity {
btnPay
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
btnPay
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
view
)
{
public
void
onClick
(
View
view
)
{
if
(
methodPay
.
equals
(
"cash"
)){
if
(
methodPay
.
equals
(
"cash"
))
{
paymentsModels
.
setPaymentType
(
"cash"
);
paymentsModels
.
setPaymentType
(
"cash"
);
Log
.
i
(
"CASH"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModels
));
Log
.
i
(
"CASH"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModels
));
bottomSheet
=
new
BottomSheets
(
paymentsModels
);
bottomSheet
=
new
BottomSheets
(
paymentsModels
);
bottomSheet
.
setCancelable
(
true
);
bottomSheet
.
setCancelable
(
true
);
bottomSheet
.
show
(
getSupportFragmentManager
(),
bottomSheet
.
show
(
getSupportFragmentManager
(),
"ModalBottomSheet"
);
"ModalBottomSheet"
);
}
else
{
}
else
{
progressDialog
.
show
();
progressDialog
.
show
();
// bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED);
// bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED);
// progressDialog.show();
// progressDialog.show();
Client
client
=
new
Client
();
Client
client
=
new
Client
();
paymentsModels
.
setPaymentType
(
"bank_transfer"
);
paymentsModels
.
setPaymentType
(
"bank_transfer"
);
paymentsModels
.
setBank
(
methodPay
);
paymentsModels
.
setBank
(
methodPay
);
paymentsModels
.
setOrderIdUpdate
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
));
paymentsModels
.
setOrderIdUpdate
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
));
paymentsModels
.
setOrderId
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
));
paymentsModels
.
setOrderId
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
));
paymentsModels
.
setTransactionStatus
(
"success"
);
paymentsModels
.
setTransactionStatus
(
"success"
);
paymentsModels
.
setTransaction_id
(
utils
.
timeStamp
()+
"-MES"
);
paymentsModels
.
setTransaction_id
(
utils
.
timeStamp
()
+
"-MES"
);
paymentsModels
.
setTransaction_time
(
utils
.
timeStamp
());
paymentsModels
.
setTransaction_time
(
utils
.
timeStamp
());
Log
.
i
(
"BANK"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModels
));
Log
.
i
(
"BANK"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModels
));
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
if
(
paymentsModelsIntent
==
null
){
<<<<<<<
HEAD
if
(
paymentsModelsIntent
==
null
)
{
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
@Override
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
Log
.
i
(
"Paymen_bank"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
Log
.
i
(
"Paymen_bank"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
){
if
(
response
.
body
()
!=
null
)
{
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
editor
.
putString
(
ORDER_ID
,
""
);
editor
.
putBoolean
(
CHECKOUT
,
false
);
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
dismiss
();
progressDialog
.
dismiss
();
if
(
editor
.
commit
()){
if
(
editor
.
commit
())
{
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
qrCode
.
show
(
getSupportFragmentManager
(),
getSupportFragmentManager
(),
"QRCode"
"QRCode"
);
);
}
}
}
else
{
}
else
{
progressDialog
.
dismiss
();
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setTitle
(
"Payment Order"
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Erorr save!"
).
show
();
.
setMessage
(
"Erorr save!"
).
show
();
}
}
}
}
=======
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
>>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Response
<
DataResponse
<
PaymentsModels
>>
response
)
{
Log
.
i
(
"Paymen_bank"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
)
{
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
dismiss
();
if
(
editor
.
commit
())
{
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
getSupportFragmentManager
(),
qrCode
.
getTag
()
);
>>>>>>>
11
ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>
>
call
,
Throwable
t
){
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Add new payment failed, try again!"
).
show
();
}
});
}
else
{
paymentService
.
postFromCartPending
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
>
call
,
Response
<
DataResponse
>
response
)
{
Log
.
i
(
"Paymen_bank_sa"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
)
{
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
dismiss
();
if
(
editor
.
commit
())
{
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
getSupportFragmentManager
(),
"QRCode"
);
}
}
else
{
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Erorr save!"
).
show
();
}
}
@Override
public
void
onFailure
(
Call
<
DataResponse
>
call
,
Throwable
t
)
{
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Add new payment failed, try again!"
).
show
();
}
});
}
@Override
}
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Throwable
t
)
{
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Add new payment failed, try again!"
).
show
();
}
}
});
});
}
else
{
paymentService
.
postFromCartPending
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
>
call
,
Response
<
DataResponse
>
response
)
{
Log
.
i
(
"Paymen_bank_sa"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
){
bottomSheet
.
setListener
(
new
BottomSheets
.
CashListener
()
{
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
@Override
editor
.
putString
(
ORDER_ID
,
""
);
public
void
onCash
(
PaymentsModels
paymentsModels
)
{
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
show
();
progressDialog
.
dismiss
();
Client
client
=
new
Client
();
if
(
editor
.
commit
()){
PaymentsModels
paymentsModels1
=
new
PaymentsModels
(
qrCode
=
new
QRCode
(
response
.
body
());
MainActivity
.
orderId
,
qrCode
.
show
(
"cash"
,
getSupportFragmentManager
(),
"none"
,
"QRCode"
grossAmount
);
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
paymentService
.
postFromCart
(
paymentsModels1
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
if
(
response
.
body
()
!=
null
)
{
progressDialog
.
dismiss
();
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putBoolean
(
CHECKOUT
,
false
);
editor
.
putString
(
orderId
,
""
);
if
(
editor
.
commit
())
{
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
}
}
}
}
}
else
{
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Erorr save!"
).
show
();
}
}
@Override
@Override
public
void
onFailure
(
Call
<
DataResponse
>
call
,
Throwable
t
)
{
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Throwable
t
)
{
progressDialog
.
dismiss
();
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
}
.
setCancelable
(
false
)
});
.
setTitle
(
"Payment Order"
)
.
setMessage
(
"Add new payment failed, try again!"
).
show
();
}
}
});
});
}
}
}
});
bottomSheet
.
setListener
(
new
BottomSheets
.
CashListener
()
{
@Override
public
void
onCash
(
PaymentsModels
paymentsModels
)
{
progressDialog
.
show
();
Client
client
=
new
Client
();
PaymentsModels
paymentsModels1
=
new
PaymentsModels
(
MainActivity
.
orderId
,
"cash"
,
"none"
,
grossAmount
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
paymentService
.
postFromCart
(
paymentsModels1
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Response
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
response
)
{
if
(
response
.
body
()
!=
null
){
progressDialog
.
dismiss
();
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putBoolean
(
CHECKOUT
,
false
);
editor
.
putString
(
orderId
,
""
);
if
(
editor
.
commit
()){
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
}
}
}
}
@Override
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
call
,
Throwable
t
)
{
public
void
onBackPressed
()
{
super
.
onBackPressed
();
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
public
void
savePaymentSuccess
()
{
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
if
(
editor
.
commit
())
{
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
}
}
}
);
}
}
}
});
{}
\ No newline at end of file
}
@Override
public
void
onBackPressed
()
{
super
.
onBackPressed
();
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
public
void
savePaymentSuccess
(){
SharedPreferences
.
Editor
editor
=
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
if
(
editor
.
commit
()){
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
}
}
app/src/main/res/layout/activity_q_r_code.xml
View file @
88b22e86
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/bot_sheet"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
style=
"@style/Widget.Rounded.BottomSheet"
style=
"@style/Widget.Rounded.BottomSheet"
app:behavior_hideable=
"false"
app:behavior_peekHeight=
"500dp"
app:layout_behavior=
"com.google.android.material.bottomsheet.BottomSheetBehavior"
app:layout_behavior=
"com.google.android.material.bottomsheet.BottomSheetBehavior"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
...
...
app/src/main/res/layout/item_category.xml
View file @
88b22e86
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
<com.google.android.material.button.MaterialButton
<com.google.android.material.button.MaterialButton
android:id=
"@+id/categoryDelete"
android:id=
"@+id/categoryDelete"
android:layout_width=
"
7
0dp"
android:layout_width=
"0dp"
android:layout_height=
"40dp"
android:layout_height=
"40dp"
android:backgroundTint=
"@android:color/holo_red_dark"
android:backgroundTint=
"@android:color/holo_red_dark"
android:text=
"DELETE"
android:text=
"DELETE"
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
<com.google.android.material.button.MaterialButton
<com.google.android.material.button.MaterialButton
android:id=
"@+id/categoryUpdate"
android:id=
"@+id/categoryUpdate"
android:layout_width=
"
7
0dp"
android:layout_width=
"0dp"
android:layout_height=
"40dp"
android:layout_height=
"40dp"
android:backgroundTint=
"@color/colorGreen"
android:backgroundTint=
"@color/colorGreen"
android:text=
"UPDATE"
android:text=
"UPDATE"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment