-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/SAPHY-33-product-favlist
- Loading branch information
Showing
26 changed files
with
1,022 additions
and
771 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-93 Bytes
android/build/ios/Pods.build/Release-iphonesimulator/Flutter.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
android/build/ios/Pods.build/Release-iphonesimulator/Pods-Runner.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
android/build/ios/Pods.build/Release-iphonesimulator/Pods-RunnerTests.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
...ease-iphonesimulator/path_provider_foundation-path_provider_foundation_privacy.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
android/build/ios/Pods.build/Release-iphonesimulator/path_provider_foundation.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
...id/build/ios/Pods.build/Release-iphonesimulator/sqflite-sqflite_darwin_privacy.build/dgph
Binary file not shown.
Binary file removed
BIN
-93 Bytes
android/build/ios/Pods.build/Release-iphonesimulator/sqflite.build/dgph
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"flutter":{"platforms":{"android":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:android:a8dc2d555589872e04c136","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:ios:8ad3553c76c38b9104c136","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:ios:8ad3553c76c38b9104c136","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"saphy-27f69","configurations":{"android":"1:754445879555:android:a8dc2d555589872e04c136","ios":"1:754445879555:ios:8ad3553c76c38b9104c136","macos":"1:754445879555:ios:8ad3553c76c38b9104c136","web":"1:754445879555:web:cc2e656898a440c704c136","windows":"1:754445879555:web:c72a3706a7218a5b04c136"}}}}}} | ||
| {"flutter":{"platforms":{"android":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:android:a6b348ed20bee7aa04c136","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:ios:32c64f4e933a9be504c136","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"saphy-27f69","appId":"1:754445879555:ios:e10abf321d33a90604c136","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"saphy-27f69","configurations":{"android":"1:754445879555:android:a6b348ed20bee7aa04c136","ios":"1:754445879555:ios:32c64f4e933a9be504c136","macos":"1:754445879555:ios:e10abf321d33a90604c136","web":"1:754445879555:web:cc2e656898a440c704c136","windows":"1:754445879555:web:c72a3706a7218a5b04c136"}}}}}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| class AccountInfo { | ||
| String? loginId; | ||
| String? name; | ||
| String? nickName; | ||
| String? phoneNumber; | ||
| String? email; | ||
| String? socialType; | ||
|
|
||
| AccountInfo({ | ||
| this.loginId, | ||
| this.name, | ||
| this.nickName, | ||
| this.phoneNumber, | ||
| this.email, | ||
| this.socialType, | ||
| }); | ||
|
|
||
| AccountInfo.fromJson(Map<String, dynamic> json) { | ||
| loginId = json['loginId']; | ||
| name = json['name']; | ||
| nickName = json['nickName']; | ||
| phoneNumber = json['phoneNumber']; | ||
| email = json['email']; | ||
| socialType = json['socialType']; | ||
| } | ||
|
|
||
| Map<String, dynamic> toJson() { | ||
| final Map<String, dynamic> data = {}; | ||
| data['loginId'] = loginId; | ||
| data['name'] = name; | ||
| data['nickName'] = nickName; | ||
| data['phoneNumber'] = phoneNumber; | ||
| data['email'] = email; | ||
| data['socialType'] = socialType; | ||
| return data; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| class MemberInfo { | ||
| String? nickname; | ||
| String? profileImgUrl; | ||
| int? purchasePendingCount; | ||
| int? purchaseInProgressCount; | ||
| int? purchaseCompletedCount; | ||
| int? deliveryStartedCount; | ||
| int? deliveryGoingCount; | ||
| int? deliveryDeliveredCount; | ||
| int? salesPendingCount; | ||
| int? salesInProgressCount; | ||
| int? salesCompletedCount; | ||
|
|
||
| MemberInfo({ | ||
| this.nickname, | ||
| this.profileImgUrl, | ||
| this.purchasePendingCount, | ||
| this.purchaseInProgressCount, | ||
| this.purchaseCompletedCount, | ||
| this.deliveryStartedCount, | ||
| this.deliveryGoingCount, | ||
| this.deliveryDeliveredCount, | ||
| this.salesPendingCount, | ||
| this.salesInProgressCount, | ||
| this.salesCompletedCount, | ||
| }); | ||
|
|
||
| MemberInfo.fromJson(Map<String, dynamic> json) { | ||
| nickname = json['nickname']; | ||
| profileImgUrl = json['profileImgUrl']; | ||
| purchasePendingCount = json['purchasePendingCount']; | ||
| purchaseInProgressCount = json['purchaseInProgressCount']; | ||
| purchaseCompletedCount = json['purchaseCompletedCount']; | ||
| deliveryStartedCount = json['deliveryStartedCount']; | ||
| deliveryGoingCount = json['deliveryGoingCount']; | ||
| deliveryDeliveredCount = json['deliveryDeliveredCount']; | ||
| salesPendingCount = json['salesPendingCount']; | ||
| salesInProgressCount = json['salesInProgressCount']; | ||
| salesCompletedCount = json['salesCompletedCount']; | ||
| } | ||
|
|
||
| Map<String, dynamic> toJson() { | ||
| final Map<String, dynamic> data = {}; | ||
| data['nickname'] = nickname; | ||
| data['profileImgUrl'] = profileImgUrl; | ||
| data['purchasePendingCount'] = purchasePendingCount; | ||
| data['purchaseInProgressCount'] = purchaseInProgressCount; | ||
| data['purchaseCompletedCount'] = purchaseCompletedCount; | ||
| data['deliveryStartedCount'] = deliveryStartedCount; | ||
| data['deliveryGoingCount'] = deliveryGoingCount; | ||
| data['deliveryDeliveredCount'] = deliveryDeliveredCount; | ||
| data['salesPendingCount'] = salesPendingCount; | ||
| data['salesInProgressCount'] = salesInProgressCount; | ||
| data['salesCompletedCount'] = salesCompletedCount; | ||
| return data; | ||
| } | ||
| } |
Oops, something went wrong.