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
399d9729
Commit
399d9729
authored
Aug 31, 2020
by
iman Fauzi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
fix payment button, ketika onchange kurang dari harga, maka button tidak aktif
parent
41dab5ea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
27 deletions
+38
-27
BottomSheets.java
app/src/main/java/com/yono/messeripos/BottomSheets.java
+32
-25
PaymentActivity.java
app/src/main/java/com/yono/messeripos/PaymentActivity.java
+3
-2
activity_q_r_code.xml
app/src/main/res/layout/activity_q_r_code.xml
+3
-0
No files found.
app/src/main/java/com/yono/messeripos/BottomSheets.java
View file @
399d9729
...
@@ -44,7 +44,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -44,7 +44,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
;
public
static
long
grossAmount
,
input
,
result
;
SharedPreferences
sharedPreferences
;
SharedPreferences
sharedPreferences
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
RelativeLayout
layoutFormCash
;
RelativeLayout
layoutFormCash
;
...
@@ -80,6 +80,8 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -80,6 +80,8 @@ public class BottomSheets extends BottomSheetDialogFragment {
totalHarga
=
v
.
findViewById
(
R
.
id
.
totalHarga
);
totalHarga
=
v
.
findViewById
(
R
.
id
.
totalHarga
);
utils
=
new
Utils
();
utils
=
new
Utils
();
btnCash
.
setEnabled
(
false
);
// 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_EXPANDED);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
...
@@ -124,14 +126,19 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -124,14 +126,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
();
long
input
=
Long
.
parseLong
(
inputAmount
.
getText
().
toString
());
input
=
Long
.
parseLong
(
inputAmount
.
getText
().
toString
());
long
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
...
@@ -146,36 +153,36 @@ public class BottomSheets extends BottomSheetDialogFragment {
...
@@ -146,36 +153,36 @@ 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
);
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
>>()
{
@Override
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
>>()
{
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Response
<
DataResponse
<
PaymentsModels
>>
response
)
{
@Override
Log
.
i
(
"CASH"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
public
void
onResponse
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Response
<
DataResponse
<
PaymentsModels
>>
response
)
{
if
(
response
.
body
()
!=
null
){
Log
.
i
(
"CASH"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
SharedPreferences
.
Editor
editor
=
PaymentActivity
.
sharedPreferences
.
edit
();
if
(
response
.
body
()
!=
null
)
{
editor
.
putBoolean
(
CHECKOUT
,
false
);
SharedPreferences
.
Editor
editor
=
PaymentActivity
.
sharedPreferences
.
edit
();
editor
.
putString
(
ORDER_ID
,
""
);
editor
.
putBoolean
(
CHECKOUT
,
false
);
if
(
editor
.
commit
()){
editor
.
putString
(
ORDER_ID
,
""
);
Intent
i
=
new
Intent
(
getActivity
(),
MainActivity
.
class
);
if
(
editor
.
commit
())
{
view
.
getContext
().
startActivity
(
i
);
Intent
i
=
new
Intent
(
getActivity
(),
MainActivity
.
class
);
view
.
getContext
().
startActivity
(
i
);
}
}
}
}
}
}
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Throwable
t
)
{
@Override
public
void
onFailure
(
Call
<
DataResponse
<
PaymentsModels
>>
call
,
Throwable
t
)
{
}
}
});
});
}
}
}
}
app/src/main/java/com/yono/messeripos/PaymentActivity.java
View file @
399d9729
...
@@ -45,6 +45,7 @@ import retrofit2.Call;
...
@@ -45,6 +45,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
;
...
@@ -66,13 +67,13 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -66,13 +67,13 @@ 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
;
PaymentsModels
paymentsModelsIntent
;
PaymentsModels
paymentsModelsIntent
;
@Override
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
...
@@ -210,7 +211,7 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -210,7 +211,7 @@ public class PaymentActivity extends AppCompatActivity {
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
qrCode
.
show
(
getSupportFragmentManager
(),
getSupportFragmentManager
(),
"QRCode"
qrCode
.
getTag
()
);
);
}
}
...
...
app/src/main/res/layout/activity_q_r_code.xml
View file @
399d9729
<?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"
>
...
...
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