Fakultas Ilmu Komputer UI
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ppl-fasilkom-ui
2021
Kelas D
PT Gizi Sehat - Dietela
Dietela Mobile
Commits
4cc5c8f8
Commit
4cc5c8f8
authored
Jun 29, 2021
by
Kefas Satrio Bangkit Solidedantyo
Browse files
Merge branch 'last-fix' into 'staging'
Fix bugs See merge request
!85
parents
32da273e
fc06ad77
Pipeline
#84203
passed with stages
in 31 minutes and 50 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
4cc5c8f8
...
...
@@ -85,7 +85,7 @@ android:
-
yarn install
-
export ANDROID_SDK_ROOT=/usr/lib/android-sdk
-
cd android
-
chmod +x gradlew && ./gradlew
clean && ./gradlew
assembleRelease
-
chmod +x gradlew && ./gradlew assembleRelease
-
cd .. && cp android/app/build/outputs/apk/release/app-release.apk $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.apk
artifacts
:
expire_in
:
1 week
...
...
src/scenes/payment/PaymentWebView/index.tsx
View file @
4cc5c8f8
...
...
@@ -13,13 +13,17 @@ const PaymentWebView: FC = () => {
const
navigation
=
useNavigation
();
const
route
=
useRoute
();
const
{
url
}
=
route
.
params
as
{
url
:
string
};
const
{
user
}
=
useContext
(
UserContext
);
const
{
user
,
setUser
}
=
useContext
(
UserContext
);
const
postPay
=
async
(
state
:
any
)
=>
{
if
(
state
.
url
.
startsWith
(
`
${
API_BASE_URL
}
/payment/midtrans-redirection`
))
{
await
updateCartApi
(
user
.
cart_id
,
{
const
response
=
await
updateCartApi
(
user
.
cart_id
,
{
transaction_status
:
TransactionStatus
.
SUCCESS
,
});
setUser
({
...
user
,
nutritionist
:
response
.
data
?.
nutritionist
||
null
,
});
navigation
.
navigate
(
ROUTES
.
paymentResult
);
}
};
...
...
src/services/auth/models.ts
View file @
4cc5c8f8
...
...
@@ -27,7 +27,11 @@ export interface User {
deadline
:
string
|
null
;
}
export
interface
AuthUserResponse
extends
User
{
export
interface
AuthUserResponse
{
id
:
number
|
null
;
email
:
string
;
name
:
string
;
role
:
UserRole
|
null
;
transaction_status
:
TransactionStatus
|
null
;
is_finished_onboarding
:
boolean
;
cart_id
:
number
|
null
;
...
...
src/services/nutritionists/models.ts
View file @
4cc5c8f8
...
...
@@ -8,4 +8,5 @@ export interface Nutritionist {
another_practice_place
:
string
;
languages
:
string
;
profile_picture
?:
string
;
phone_number
:
string
;
}
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