Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #81 from tiki-bar/release/prod-ready
Browse files Browse the repository at this point in the history
Release: prod ready
  • Loading branch information
mike-audi authored Aug 17, 2023
2 parents 4fd553d + 083035b commit 3ac3f5d
Show file tree
Hide file tree
Showing 12 changed files with 644 additions and 240 deletions.
8 changes: 4 additions & 4 deletions example/ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ PODS:
- Capacitor (5.2.3):
- CapacitorCordova
- CapacitorCordova (5.2.3)
- MytikiTikiCaptureReceiptCapacitor (0.2.6):
- MytikiTikiCaptureReceiptCapacitor (0.3.0):
- Capacitor
- MytikiTikiSdkCapacitor (0.3.0):
- MytikiTikiSdkCapacitor (0.3.1):
- Capacitor

DEPENDENCIES:
Expand All @@ -26,8 +26,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Capacitor: 6f44cbc33839b8a4202b8eac97041fe584083417
CapacitorCordova: 35def3ebfdef491f0a7b652816eb873ff4b20bbf
MytikiTikiCaptureReceiptCapacitor: f2c39fcd7289674b51b4c4eb139461e56b9b3a6d
MytikiTikiSdkCapacitor: a2c4dcd954f2f8e4fec9fa21aea8cbad58a8f0f6
MytikiTikiCaptureReceiptCapacitor: 33e80ff6f86c5c93998d9da1f84f0096a56d1721
MytikiTikiSdkCapacitor: 7fb71c6099dd3bba5c75ee7ec1dd30bd90c78c9c

PODFILE CHECKSUM: 2f9a0f322694e9fc6ea5b4ef01d7ecdb29338094

Expand Down
30 changes: 15 additions & 15 deletions example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@capacitor/android": "^5.2.3",
"@capacitor/core": "^5.2.3",
"@capacitor/ios": "^5.2.3",
"@mytiki/tiki-capture-receipt-capacitor": "^0.2.6",
"@mytiki/tiki-capture-receipt-capacitor": "^0.3.0",
"@mytiki/tiki-receipt-capacitor": "file:..",
"@mytiki/tiki-sdk-capacitor": "^0.3.0",
"@mytiki/tiki-sdk-capacitor": "^0.3.1",
"uuid": "^9.0.0",
"vue": "^3.3.4"
},
Expand Down
2 changes: 1 addition & 1 deletion example/src/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { v4 as uuidv4 } from "uuid";

const tiki: TikiService | undefined = inject("Tiki");
const id: string = uuidv4();
tiki?.initialize(id);
tiki?.initialize(id).then(() => tiki?.logout());
const present = ref(false);
</script>

Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mytiki/tiki-receipt-capacitor",
"version": "0.1.2",
"version": "0.2.0",
"description": "pineapple",
"files": [
"dist"
Expand All @@ -23,8 +23,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@mytiki/tiki-capture-receipt-capacitor": "^0.2.6",
"@mytiki/tiki-sdk-capacitor": "^0.3.0",
"@mytiki/tiki-capture-receipt-capacitor": "^0.3.0",
"@mytiki/tiki-sdk-capacitor": "^0.3.1",
"hammerjs": "^2.0.8",
"vue": "^3.3.4",
"vue-confetti-explosion": "^1.0.2",
Expand Down Expand Up @@ -59,7 +59,7 @@
"@capacitor/android": "^5.2.2",
"@capacitor/core": "^5.2.2",
"@capacitor/ios": "^5.2.2",
"@mytiki/tiki-capture-receipt-capacitor": "^0.2.6",
"@mytiki/tiki-sdk-capacitor": "^0.3.0"
"@mytiki/tiki-capture-receipt-capacitor": "^0.3.0",
"@mytiki/tiki-sdk-capacitor": "^0.3.1"
}
}
1 change: 1 addition & 0 deletions src/components/account/account-link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const submit = async () => {
form.value.password?.length > 0
) {
try {
error.value = ''
await tiki?.receipt.login(form.value);
form.value = new ReceiptAccount("", ReceiptAccountType.GMAIL, "");
} catch (err: any) {
Expand Down
4 changes: 2 additions & 2 deletions src/service/history/history-event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export class HistoryEvent {
return new HistoryEvent(
payable.description,
Number(payable.amount),
new Date(),
payable.timestamp != undefined ? new Date(payable.timestamp) : new Date(),
type,
);
}
Expand All @@ -151,7 +151,7 @@ export class HistoryEvent {
return new HistoryEvent(
receipt.description ?? HistoryEvent.REDEEM_NAME_POSTFIX,
Number(receipt.amount),
new Date(),
receipt.timestamp != undefined ? new Date(receipt.timestamp) : new Date(),
ReceiptEvent.REDEEM,
);
}
Expand Down
8 changes: 8 additions & 0 deletions src/service/history/history-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,12 @@ export class HistoryService {
}
}
}

/**
* Clears all in-mem history and balance totals
*/
clear = (): void => {
this._history = [];
this._total = 0;
};
}
Loading

0 comments on commit 3ac3f5d

Please sign in to comment.