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
005a5c7f
Commit
005a5c7f
authored
Aug 31, 2020
by
Alfansyah Fadlian
Browse files
Options
Browse Files
Download
Plain Diff
test
parents
88b22e86
1247a99e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
4 deletions
+23
-4
BottomSheets.java
app/src/main/java/com/yono/messeripos/BottomSheets.java
+4
-0
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
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 @
005a5c7f
...
...
@@ -47,7 +47,11 @@ public class BottomSheets extends BottomSheetDialogFragment {
Utils
utils
;
String
defaultText
=
"0"
;
Client
client
=
new
Client
();
<<<<<<<
HEAD
public
static
long
grossAmount
,
result
,
input
;
=======
public
static
long
grossAmount
,
input
,
result
;
>>>>>>>
11
ad115d91d3c4c2c59b6e78989bffbbad0f3ed1
SharedPreferences
sharedPreferences
;
public
static
BottomSheetBehavior
bottomSheetBehavior
;
RelativeLayout
layoutFormCash
;
...
...
app/src/main/java/com/yono/messeripos/CartActivity.java
View file @
005a5c7f
...
...
@@ -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 @
005a5c7f
...
...
@@ -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 @
005a5c7f
...
...
@@ -121,7 +121,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/api/service/PaymentService.java
View file @
005a5c7f
...
...
@@ -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 @
005a5c7f
...
...
@@ -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