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
7bdba6f8
Commit
7bdba6f8
authored
Aug 31, 2020
by
Muhammad Suryono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update
parent
f808c3ba
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
122 additions
and
48 deletions
+122
-48
BottomSheets.java
app/src/main/java/com/yono/messeripos/BottomSheets.java
+57
-25
CartActivity.java
app/src/main/java/com/yono/messeripos/CartActivity.java
+2
-1
HistoryActivity.java
app/src/main/java/com/yono/messeripos/HistoryActivity.java
+1
-0
MainActivity.java
app/src/main/java/com/yono/messeripos/MainActivity.java
+1
-1
PaymentActivity.java
app/src/main/java/com/yono/messeripos/PaymentActivity.java
+46
-19
PaymentService.java
.../java/com/yono/messeripos/api/service/PaymentService.java
+4
-2
PaymentsModels.java
.../main/java/com/yono/messeripos/models/PaymentsModels.java
+11
-0
No files found.
app/src/main/java/com/yono/messeripos/BottomSheets.java
View file @
7bdba6f8
...
...
@@ -51,11 +51,13 @@ public class BottomSheets extends BottomSheetDialogFragment {
SharedPreferences
sharedPreferences
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
RelativeLayout
layoutFormCash
;
int
statusUpdatePayment
=
0
;
PaymentsModels
paymentsModels
;
public
static
PaymentsModels
paymentsModels
;
public
BottomSheets
(
PaymentsModels
paymentsModels
)
{
public
BottomSheets
(
PaymentsModels
paymentsModels
,
int
statusUpdatePayment
)
{
this
.
paymentsModels
=
paymentsModels
;
this
.
statusUpdatePayment
=
statusUpdatePayment
;
}
public
interface
CashListener
{
...
...
@@ -86,6 +88,8 @@ public class BottomSheets extends BottomSheetDialogFragment {
sharedPreferences
=
getActivity
().
getSharedPreferences
(
MainActivity
.
MY_SHARED_PREFERENCES
,
Context
.
MODE_PRIVATE
);
// bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
Log
.
i
(
"BITTOM"
,
"BottomSheets: "
+
utils
.
convertGson
(
paymentsModels
)+
"ID "
+
statusUpdatePayment
);
long
ga
=
paymentsModels
.
getGrossAmount
();
String
setCurrency
=
utils
.
convertPrice
(
"Rp."
,
ga
);
...
...
@@ -105,7 +109,7 @@ public class BottomSheets extends BottomSheetDialogFragment {
// case BottomSheetBehavior.STATE_DRAGGING:
// break;
// case BottomSheetBehavior.STATE_SETTLING:
// break;
// break;
int
// }
// }
...
...
@@ -151,18 +155,20 @@ public class BottomSheets extends BottomSheetDialogFragment {
private
void
bayar
(
View
view
)
{
// String orderId, String paymentType, String bank, long grossAmount
PaymentsModels
paymentsModels
=
new
PaymentsModels
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
),
"cash"
,
"none"
,
grossAmount
);
PaymentsModels
paymentsModels1
=
new
PaymentsModels
();
paymentsModels1
.
setTransactionStatus
(
"success"
);
paymentsModels1
.
setPaymentType
(
"cash"
);
paymentsModels1
.
setGrossAmount
(
grossAmount
);
paymentsModels1
.
setBank
(
""
);
PaymentService
paymentService
=
client
.
Client
(
PaymentService
.
class
);
paymentService
.
postFromCart
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>()
{
if
(
statusUpdatePayment
==
0
){
paymentsModels1
.
setOrderId
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
));
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
)
{
Log
.
i
(
"CASH
"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
Log
.
i
(
"CASH_0
"
,
"onResponse: "
+
utils
.
convertGson
(
response
.
body
()));
if
(
response
.
body
()
!=
null
){
SharedPreferences
.
Editor
editor
=
PaymentActivity
.
sharedPreferences
.
edit
();
editor
.
putBoolean
(
CHECKOUT
,
false
);
...
...
@@ -179,6 +185,32 @@ public class BottomSheets extends BottomSheetDialogFragment {
}
});
}
else
{
paymentsModels
.
setTransactionStatus
(
"success"
);
paymentsModels
.
setPaymentType
(
"cash"
);
paymentService
.
postFromCartPending
(
paymentsModels
.
getOrderId
(),
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
>
call
,
Response
<
DataResponse
>
response
)
{
Log
.
i
(
"CASH_1"
,
"onResponse: "
+
utils
.
convertGson
(
paymentsModels
));
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
>
call
,
Throwable
t
)
{
}
});
}
}
}
app/src/main/java/com/yono/messeripos/CartActivity.java
View file @
7bdba6f8
...
...
@@ -115,7 +115,7 @@ public class CartActivity extends AppCompatActivity {
modelsCart
=
new
ViewModelProvider
(
this
).
get
(
MainViewModelsCart
.
class
);
// show to cart
Log
.
i
(
"GET CART"
,
"onCreate: "
+
paymentsModelsIntent
);
Log
.
i
(
"GET CART"
,
"onCreate: "
+
utils
.
convertGson
(
paymentsModelsIntent
)
);
if
(
paymentsModelsIntent
==
null
){
modelsCart
=
new
ViewModelProvider
(
this
).
get
(
MainViewModelsCart
.
class
);
modelsCart
.
getCartById
(
sharedPreferences
.
getString
(
ORDER_ID
,
""
)).
observe
(
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
...
...
@@ -207,6 +207,7 @@ public class CartActivity extends AppCompatActivity {
if
(
editor
.
commit
()){
Log
.
i
(
"FROM_CHECKOUT_INTENT"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModelsIntent
));
if
(
paymentsModelsIntent
!=
null
){
Log
.
i
(
"TAGAAAAA"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModelsIntent
));
startActivity
(
new
Intent
(
CartActivity
.
this
,
PaymentActivity
.
class
)
.
putExtra
(
CODE_SEND_CHECKOUT_HISTORY
,
paymentsModelsIntent
));
}
else
{
...
...
app/src/main/java/com/yono/messeripos/HistoryActivity.java
View file @
7bdba6f8
...
...
@@ -100,6 +100,7 @@ public class HistoryActivity extends AppCompatActivity {
.
setTitle
(
"Transaction"
)
.
setMessage
(
"Transaction success!"
).
show
();
}
else
if
(
paymentsModels
.
getPaymentType
().
equals
(
"pending"
)){
Log
.
i
(
"JAJSKASA"
,
"onShowDetail: "
+
utils
.
convertGson
(
paymentsModels
));
startActivity
(
new
Intent
(
HistoryActivity
.
this
,
CartActivity
.
class
).
putExtra
(
DATA_TRANSACTION_PENDING
,
paymentsModels
));
}
...
...
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @
7bdba6f8
...
...
@@ -122,7 +122,7 @@ public class MainActivity extends AppCompatActivity {
editor
.
putString
(
ORDER_ID
,
"MES-ORDER"
+
utils
.
timeStamp
());
if
(
editor
.
commit
()){
Log
.
i
(
"ORDER ID"
,
"onCreate: "
+
sharedPreferences
.
getString
(
ORDER_ID
,
""
).
toString
());
Toast
.
makeText
(
MainActivity
.
this
,
sharedPreferences
.
getString
(
ORDER_ID
,
""
).
toString
(),
Toast
.
LENGTH_LONG
).
show
();
//
Toast.makeText(MainActivity.this, sharedPreferences.getString(ORDER_ID,"").toString(), Toast.LENGTH_LONG).show();
}
}
...
...
app/src/main/java/com/yono/messeripos/PaymentActivity.java
View file @
7bdba6f8
...
...
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
import
android.app.AlertDialog
;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.os.Build
;
...
...
@@ -88,6 +89,7 @@ public class PaymentActivity extends AppCompatActivity {
sharedPreferences
=
getSharedPreferences
(
MainActivity
.
MY_SHARED_PREFERENCES
,
Context
.
MODE_PRIVATE
);
paymentsModelsIntent
=
getIntent
().
getParcelableExtra
(
CartActivity
.
CODE_SEND_CHECKOUT_HISTORY
);
paymentsModels
=
new
PaymentsModels
();
checkoutAdapter
=
new
CheckoutAdapter
();
recyclerView
=
findViewById
(
R
.
id
.
rvItem
);
...
...
@@ -131,7 +133,7 @@ public class PaymentActivity extends AppCompatActivity {
@Override
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
String
js
=
new
Gson
().
toJson
(
productCartModels
);
Log
.
i
(
"On Intent_CHANGE"
,
"onChanged: "
+
paymentsModels
.
getOrderId
());
Log
.
i
(
"On Intent_CHANGE"
,
"onChanged: "
+
paymentsModels
Intent
.
getOrderId
());
for
(
ProductCartModels
pd
:
productCartModels
){
total
=
total
+
pd
.
getPrice_orders
()*
pd
.
getQuantity_orders
();
...
...
@@ -139,8 +141,8 @@ public class PaymentActivity extends AppCompatActivity {
if
(
productCartModels
.
size
()
!=
0
){
getSupportActionBar
().
setTitle
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
.
setGrossAmount
(
total
);
paymentsModels
Intent
.
setOrderId
(
productCartModels
.
get
(
0
).
getId_orders
());
paymentsModels
Intent
.
setGrossAmount
(
total
);
checkoutAdapter
.
setCheckoutAdapter
(
PaymentActivity
.
this
,
productCartModels
);
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
PaymentActivity
.
this
,
RecyclerView
.
VERTICAL
,
false
));
recyclerView
.
setAdapter
(
checkoutAdapter
);
...
...
@@ -152,7 +154,7 @@ public class PaymentActivity extends AppCompatActivity {
});
}
bottomSheet
=
new
BottomSheets
(
paymentsModels
);
bottomSheet
=
new
BottomSheets
(
paymentsModels
,
0
);
RecyclerView
rvPayment
=
findViewById
(
R
.
id
.
rvPayment
);
...
...
@@ -179,16 +181,29 @@ public class PaymentActivity extends AppCompatActivity {
public
void
onClick
(
View
view
)
{
if
(
methodPay
.
equals
(
"cash"
)){
paymentsModels
.
setPaymentType
(
"cash"
);
paymentsModels
.
setTransactionStatus
(
"success"
);
paymentsModels
.
setTransaction_id
(
utils
.
timeStamp
()+
"-MES"
);
paymentsModels
.
setTransaction_time
(
utils
.
timeStamp
());
Log
.
i
(
"CASH"
,
"onClick: "
+
utils
.
convertGson
(
paymentsModels
));
bottomSheet
=
new
BottomSheets
(
paymentsModels
);
if
(
paymentsModelsIntent
==
null
){
bottomSheet
=
new
BottomSheets
(
paymentsModels
,
0
);
bottomSheet
.
setCancelable
(
true
);
bottomSheet
.
show
(
getSupportFragmentManager
(),
"ModalBottomSheet"
);
}
else
{
bottomSheet
=
new
BottomSheets
(
paymentsModelsIntent
,
1
);
bottomSheet
.
setCancelable
(
true
);
bottomSheet
.
show
(
getSupportFragmentManager
(),
"ModalBottomSheet"
);
}
}
else
{
progressDialog
.
show
();
progressDialog
.
setCancelable
(
false
);
// bottomSheetBank.setState(BottomSheetBehavior.STATE_EXPANDED);
// progressDialog.show();
Client
client
=
new
Client
();
...
...
@@ -213,11 +228,17 @@ public class PaymentActivity extends AppCompatActivity {
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
dismiss
();
if
(
editor
.
commit
()){
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
getSupportFragmentManager
(),
"QRCode"
);
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
"Create Payment"
)
.
setMessage
(
"Created payment succes! Please make a payment immediately!"
)
.
setPositiveButton
(
"Oke"
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
}).
show
();
}
}
else
{
progressDialog
.
dismiss
();
...
...
@@ -237,7 +258,7 @@ public class PaymentActivity extends AppCompatActivity {
}
});
}
else
{
paymentService
.
postFromCartPending
(
paymentsModels
).
enqueue
(
new
Callback
<
DataResponse
>()
{
paymentService
.
postFromCartPending
(
paymentsModels
Intent
.
getOrderId
(),
paymentsModelsIntent
).
enqueue
(
new
Callback
<
DataResponse
>()
{
@Override
public
void
onResponse
(
Call
<
DataResponse
>
call
,
Response
<
DataResponse
>
response
)
{
...
...
@@ -249,11 +270,17 @@ public class PaymentActivity extends AppCompatActivity {
editor
.
putBoolean
(
CHECKOUT
,
false
);
progressDialog
.
dismiss
();
if
(
editor
.
commit
()){
qrCode
=
new
QRCode
(
response
.
body
());
qrCode
.
show
(
getSupportFragmentManager
(),
"QRCode"
);
new
AlertDialog
.
Builder
(
PaymentActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
"Create Payment"
)
.
setMessage
(
"Created payment succes! Please make a payment immediately!"
)
.
setPositiveButton
(
"Oke"
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
MainActivity
.
class
));
finish
();
}
}).
show
();
}
}
else
{
progressDialog
.
dismiss
();
...
...
app/src/main/java/com/yono/messeripos/api/service/PaymentService.java
View file @
7bdba6f8
...
...
@@ -11,14 +11,16 @@ import retrofit2.Call;
import
retrofit2.http.Body
;
import
retrofit2.http.GET
;
import
retrofit2.http.POST
;
import
retrofit2.http.PUT
;
import
retrofit2.http.Path
;
public
interface
PaymentService
{
@POST
(
ApiHelper
.
VERSI_API_1
+
"payment"
)
Call
<
DataResponse
<
PaymentsModels
<
List
<
VaNumberModels
>>>>
postFromCart
(
@Body
PaymentsModels
paymentsModels
);
@POST
(
ApiHelper
.
VERSI_API_1
+
"payment/midtrans/push"
)
Call
<
DataResponse
>
postFromCartPending
(
@Body
PaymentsModels
paymentsModels
);
@PUT
(
ApiHelper
.
VERSI_API_1
+
"payment/{id}"
)
Call
<
DataResponse
>
postFromCartPending
(
@Path
(
"id"
)
String
id
,
@Body
PaymentsModels
paymentsModels
);
@GET
(
ApiHelper
.
VERSI_API_1
+
"payment/{id}"
)
Call
<
DataResponse
<
PaymentsModels
>>
getTransactionById
(
@Body
PaymentsModels
paymentsModels
,
@Path
(
"id"
)
int
id
);
...
...
app/src/main/java/com/yono/messeripos/models/PaymentsModels.java
View file @
7bdba6f8
...
...
@@ -11,6 +11,9 @@ import com.google.gson.annotations.SerializedName;
import
com.yono.messeripos.R
;
public
class
PaymentsModels
<
T
>
implements
Parcelable
{
@SerializedName
(
"id"
)
private
int
id
;
@SerializedName
(
"order_code"
)
private
String
orderId
;
...
...
@@ -181,6 +184,14 @@ public class PaymentsModels<T> implements Parcelable {
return
0
;
}
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
@Override
public
void
writeToParcel
(
Parcel
parcel
,
int
i
)
{
parcel
.
writeString
(
orderId
);
...
...
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