Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
Your Cashier
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
Ahmad Abi Mulya
Your Cashier
Commits
7f4e6c20
Commit
7f4e6c20
authored
Aug 28, 2020
by
Wahyu Wibowo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update payment
parent
f6bc1965
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
45 deletions
+52
-45
LoginActivity.java
...com/example/yourcashiertest/activities/LoginActivity.java
+7
-5
PaymentActivity.java
...m/example/yourcashiertest/activities/PaymentActivity.java
+32
-38
StatusPayment.java
...com/example/yourcashiertest/activities/StatusPayment.java
+3
-0
activity_payment.xml
app/src/main/res/layout/activity_payment.xml
+10
-2
No files found.
app/src/main/java/com/example/yourcashiertest/activities/LoginActivity.java
View file @
7f4e6c20
...
@@ -68,13 +68,15 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -68,13 +68,15 @@ public class LoginActivity extends AppCompatActivity {
startActivity
(
new
Intent
(
LoginActivity
.
this
,
MainActivity
.
class
).
putExtra
(
DATA_LOGIN
,
users
.
get
(
i
).
getFullName
()).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
startActivity
(
new
Intent
(
LoginActivity
.
this
,
MainActivity
.
class
).
putExtra
(
DATA_LOGIN
,
users
.
get
(
i
).
getFullName
()).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
finish
();
finish
();
return
;
return
;
}
else
if
(!
binding
.
etUsername
.
getText
().
toString
().
equals
(
users
.
get
(
i
).
getEmail
()))
{
binding
.
etUsername
.
setError
(
"Email Not Found!"
);
}
else
if
(!
binding
.
etPassword
.
getText
().
toString
().
equals
(
users
.
get
(
i
).
getPassword
()))
{
binding
.
etPassword
.
setError
(
"Password Wrong!"
);
}
}
// else if (!binding.etUsername.getText().toString().equals(users.get(i).getEmail())) {
// binding.etUsername.setError("Email Not Found!");
// } else if (!binding.etPassword.getText().toString().equals(users.get(i).getPassword())) {
// binding.etPassword.setError("Password Wrong!");
// }
}
}
Toast
.
makeText
(
LoginActivity
.
this
,
"User tidak ditemukan"
,
Toast
.
LENGTH_LONG
).
show
();
return
;
});
});
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
e
.
printStackTrace
();
e
.
printStackTrace
();
...
...
app/src/main/java/com/example/yourcashiertest/activities/PaymentActivity.java
View file @
7f4e6c20
...
@@ -6,11 +6,13 @@ import androidx.cardview.widget.CardView;
...
@@ -6,11 +6,13 @@ import androidx.cardview.widget.CardView;
import
androidx.databinding.DataBindingUtil
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.lifecycle.ViewModelProvider
;
import
android.annotation.SuppressLint
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.MotionEvent
;
import
android.view.MotionEvent
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.RadioButton
;
import
android.widget.RadioButton
;
...
@@ -30,8 +32,10 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -30,8 +32,10 @@ public class PaymentActivity extends AppCompatActivity {
public
int
refund
;
public
int
refund
;
public
int
amount
;
public
int
amount
;
CartViewModel
cartViewModel
;
CartViewModel
cartViewModel
;
public
boolean
change
=
false
;
public
String
payment
=
""
;
public
static
final
String
PAY_WITH
=
"pay_with"
;
@SuppressLint
(
"ResourceAsColor"
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
N
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
N
)
@Override
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
...
@@ -43,56 +47,46 @@ public class PaymentActivity extends AppCompatActivity {
...
@@ -43,56 +47,46 @@ public class PaymentActivity extends AppCompatActivity {
amount
=
getIntent
().
getIntExtra
(
CartActivity
.
PRICE
,
0
);
amount
=
getIntent
().
getIntExtra
(
CartActivity
.
PRICE
,
0
);
binding
.
setAmount
(
Convert
.
changeToCurrency
(
amount
));
binding
.
setAmount
(
Convert
.
changeToCurrency
(
amount
));
// binding.cbCash.setOnTouchListener((view, event) -> {
binding
.
cbCash
.
setOnClickListener
(
v
->
{
// changeCvColor(event, binding.cvCash);
if
(
binding
.
getCheckCash
()){
// return true;
binding
.
setCheckCash
(
false
);
// });
binding
.
cvCash
.
setCardBackgroundColor
(
0
);
//
payment
=
""
;
// binding.cbCard.setOnTouchListener((view, event) -> {
}
else
{
// changeCvColor(event, binding.cvCard);
binding
.
setCheckCash
(
true
);
// return true;
binding
.
cvCash
.
setCardBackgroundColor
(
R
.
color
.
blue
);
// });
payment
=
"Cash"
;
}
});
binding
.
cbCard
.
setOnClickListener
(
v
->
{
if
(
binding
.
getCheckCard
()){
binding
.
setCheckCard
(
false
);
binding
.
cvCard
.
setCardBackgroundColor
(
0
);
payment
=
""
;
}
else
{
binding
.
setCheckCard
(
true
);
binding
.
cvCard
.
setCardBackgroundColor
(
R
.
color
.
blue
);
payment
=
"Card"
;
}
});
}
}
public
void
btnPay
(
View
view
)
{
public
void
btnPay
(
View
view
)
{
if
(
TextUtils
.
isEmpty
(
binding
.
etAmountPaid
.
getText
().
toString
())){
if
(
TextUtils
.
isEmpty
(
binding
.
etAmountPaid
.
getText
().
toString
())){
ViewUtil
.
showMessage
(
view
,
"Please input Amount Paid by Customer!"
);
ViewUtil
.
showMessage
(
view
,
"Please input Amount Paid by Customer!"
);
}
else
{
}
else
if
(
payment
.
equals
(
""
)){
ViewUtil
.
showMessage
(
view
,
"Please choose type payment"
);
}
else
{
int
amountPaid
=
Integer
.
parseInt
(
binding
.
etAmountPaid
.
getText
().
toString
());
int
amountPaid
=
Integer
.
parseInt
(
binding
.
etAmountPaid
.
getText
().
toString
());
refund
=
amountPaid
-
amount
;
refund
=
amountPaid
-
amount
;
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
StatusPayment
.
class
).
putExtra
(
REFUND
,
refund
));
startActivity
(
new
Intent
(
PaymentActivity
.
this
,
StatusPayment
.
class
).
putExtra
(
REFUND
,
refund
)
.
putExtra
(
PAY_WITH
,
payment
)
);
cartViewModel
.
clear
();
cartViewModel
.
clear
();
finish
();
finish
();
}
}
}
}
// public void changeCvColor(MotionEvent event, CardView cv){
// if (change) {
// change = false;
// switch (event.getAction()) {
// case MotionEvent.ACTION_DOWN:
// cv.setCardBackgroundColor(getResources().getColor(R.color.choose_payment));
// break;
// case MotionEvent.ACTION_UP:
// cv.setCardBackgroundColor(getResources().getColor(R.color.white));
// }
// } else {
// change = true;
// switch (event.getAction()) {
// case MotionEvent.ACTION_DOWN:
// cv.setCardBackgroundColor(getResources().getColor(R.color.white));
// break;
// case MotionEvent.ACTION_UP:
// cv.setCardBackgroundColor(getResources().getColor(R.color.choose_payment));
// }
// }
// }
@Override
@Override
protected
void
onDestroy
()
{
protected
void
onDestroy
()
{
super
.
onDestroy
();
super
.
onDestroy
();
...
...
app/src/main/java/com/example/yourcashiertest/activities/StatusPayment.java
View file @
7f4e6c20
...
@@ -24,6 +24,9 @@ public class StatusPayment extends AppCompatActivity {
...
@@ -24,6 +24,9 @@ public class StatusPayment extends AppCompatActivity {
int
refund
=
getIntent
().
getIntExtra
(
PaymentActivity
.
REFUND
,
0
);
int
refund
=
getIntent
().
getIntExtra
(
PaymentActivity
.
REFUND
,
0
);
Log
.
d
(
"Tag"
,
String
.
valueOf
(
refund
));
Log
.
d
(
"Tag"
,
String
.
valueOf
(
refund
));
binding
.
setRefund
(
Convert
.
changeToCurrency
(
refund
));
binding
.
setRefund
(
Convert
.
changeToCurrency
(
refund
));
String
status_pay
=
getIntent
().
getStringExtra
(
PaymentActivity
.
PAY_WITH
);
binding
.
tvPaymentSuccess
.
setText
(
"Payment by "
+
status_pay
+
" was successful"
);
}
}
public
void
btnFinish
(
View
view
)
{
public
void
btnFinish
(
View
view
)
{
...
...
app/src/main/res/layout/activity_payment.xml
View file @
7f4e6c20
...
@@ -4,6 +4,14 @@
...
@@ -4,6 +4,14 @@
xmlns:tools=
"http://schemas.android.com/tools"
>
xmlns:tools=
"http://schemas.android.com/tools"
>
<data>
<data>
<variable
name=
"checkCash"
type=
"boolean"
/>
<variable
name=
"checkCard"
type=
"boolean"
/>
<variable
<variable
name=
"amount"
name=
"amount"
type=
"String"
/>
type=
"String"
/>
...
@@ -77,11 +85,10 @@
...
@@ -77,11 +85,10 @@
android:layout_marginEnd=
"20dp"
android:layout_marginEnd=
"20dp"
android:buttonTint=
"@color/black"
android:buttonTint=
"@color/black"
android:text=
"Cash"
android:text=
"Cash"
android:checked=
"@{checkCash}"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
...
@@ -117,6 +124,7 @@
...
@@ -117,6 +124,7 @@
android:layout_marginEnd=
"20dp"
android:layout_marginEnd=
"20dp"
android:buttonTint=
"@color/black"
android:buttonTint=
"@color/black"
android:text=
"Card"
android:text=
"Card"
android:checked=
"@{checkCard}"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
...
...
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