orionplace-svelte 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -3
- package/bin/orionplace-svelte.mjs +38 -7
- package/package.json +1 -1
- package/runtime/marketplace.mjs +12 -0
- package/src/install.mjs +5 -4
- package/src/project-readme.mjs +3 -0
- package/src/service.mjs +186 -0
- package/templates/src/lib/components/orionplace/subscriptions/StorefrontTariff.svelte +21 -1
- package/templates/src/lib/components/orionplace/subscriptions/StorefrontTariffs.svelte +28 -2
- package/templates/src/lib/components/orionplace/tariffs/TariffCard.svelte +13 -3
- package/templates/src/lib/components/orionplace/tariffs/TariffCardPrices.README.md +1 -1
- package/templates/src/lib/components/orionplace/tariffs/TariffCardPrices.svelte +24 -4
- package/templates/src/lib/composables/useOrionplaceSubscriptions.svelte.ts +43 -0
- package/templates/src/lib/stores/orionplaceCatalog.svelte.ts +21 -0
- package/templates/src/lib/utils/orionplace/tariffLabels.ts +2 -0
- package/templates/src/lib/utils/orionplace/tariffs.ts +49 -0
package/README.md
CHANGED
|
@@ -324,6 +324,8 @@ npx orionplace-svelte add frontend www.shop.example.com
|
|
|
324
324
|
npx orionplace-svelte remove frontend www.shop.example.com
|
|
325
325
|
npx orionplace-svelte set mimic shop.example.com
|
|
326
326
|
sudo npx orionplace-svelte install
|
|
327
|
+
npx orionplace-svelte status
|
|
328
|
+
sudo npx orionplace-svelte restart
|
|
327
329
|
npx orionplace-svelte help
|
|
328
330
|
```
|
|
329
331
|
|
|
@@ -370,9 +372,34 @@ builds the project, runs it as the system service `orionplace-shop` on a free
|
|
|
370
372
|
local port and connects each storefront domain with nginx and a Let's Encrypt
|
|
371
373
|
certificate. Run it again after code or package updates; the service keeps its
|
|
372
374
|
port. Options: `--name <service>`, `--port <port>`, `--user <user>`,
|
|
373
|
-
`--no-domains`, `--yes`,
|
|
375
|
+
`--no-build` (install the build already in the folder), `--no-domains`, `--yes`,
|
|
376
|
+
`--dry-run`. Full guide:
|
|
374
377
|
[Install a storefront](https://orionmarket.place/en/sandbox/install/storefront?framework=svelte).
|
|
375
378
|
|
|
379
|
+
### Manage the service
|
|
380
|
+
|
|
381
|
+
Run these in the project folder, or name the service from anywhere with
|
|
382
|
+
`--name shop`:
|
|
383
|
+
|
|
384
|
+
```bash
|
|
385
|
+
npx orionplace-svelte status # running?, autostart, port, home page answer, domains
|
|
386
|
+
sudo npx orionplace-svelte start
|
|
387
|
+
sudo npx orionplace-svelte stop
|
|
388
|
+
sudo npx orionplace-svelte restart # waits until the home page answers again
|
|
389
|
+
sudo npx orionplace-svelte logs 200 # last log lines; --follow keeps reading
|
|
390
|
+
npx orionplace-svelte list # every storefront service on this server
|
|
391
|
+
sudo npx orionplace-svelte uninstall # stop and remove the service (alias: cleanup)
|
|
392
|
+
```
|
|
393
|
+
|
|
394
|
+
`start` and `restart` wait up to 90 seconds for the home page and print the
|
|
395
|
+
last log lines when it does not answer. `status` ends with code 3 when the
|
|
396
|
+
storefront is stopped or does not answer, so scripts and monitors can use it.
|
|
397
|
+
`uninstall` (or `cleanup`) stops the service, takes it out of autostart and
|
|
398
|
+
deletes its unit file and registration; the project folder and its build stay.
|
|
399
|
+
With the `orionplace` server tool it runs `orionplace app remove`, which also
|
|
400
|
+
turns the storefront's domains into a placeholder page. `--dry-run` shows what it
|
|
401
|
+
would remove; `--yes` skips the question.
|
|
402
|
+
|
|
376
403
|
## Generated files
|
|
377
404
|
|
|
378
405
|
| Path | Purpose |
|
|
@@ -442,8 +469,14 @@ The corresponding `.cfg` is read on every request. Backend URLs must use HTTPS,
|
|
|
442
469
|
end in `/api`, and belong to `*.orionplace.app`. API methods, query strings, bodies,
|
|
443
470
|
authorization and cookies are forwarded. Backend statuses are retained and cookie
|
|
444
471
|
Domain attributes are removed to bind cookies to the storefront. Gateway responses
|
|
445
|
-
use `Cache-Control: no-store`. Network failures return `502`.
|
|
446
|
-
|
|
472
|
+
use `Cache-Control: no-store`. Network failures return `502`.
|
|
473
|
+
|
|
474
|
+
A changing request (POST, PUT, PATCH, DELETE) from another site is rejected with
|
|
475
|
+
`403`. A request from the page's own host or the storefront domain passes, and the
|
|
476
|
+
backend receives it with the storefront domain's origin
|
|
477
|
+
(`https://shop.example.com`), the one it accepts forms from. So a host that shows
|
|
478
|
+
the storefront through `X-Front-Domain`, such as a preview host or a local port,
|
|
479
|
+
can sign in too.
|
|
447
480
|
|
|
448
481
|
SvelteKit ignores a request body sent without a `Content-Type` header, so always
|
|
449
482
|
set it on your own API calls; browsers do this automatically for `fetch`.
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { setupProject } from '../src/setup.mjs';
|
|
3
3
|
import { updateProject } from '../src/update.mjs';
|
|
4
4
|
import { installService } from '../src/install.mjs';
|
|
5
|
+
import { SERVICE_ACTIONS, SERVICE_ALIASES, controlService, findApp, printService } from '../src/service.mjs';
|
|
5
6
|
import { readFile } from 'node:fs/promises';
|
|
6
7
|
import { resolve } from 'node:path';
|
|
7
8
|
import { createInterface } from 'node:readline/promises';
|
|
@@ -37,9 +38,20 @@ On your Linux server (run from the project root):
|
|
|
37
38
|
nginx and HTTPS. Run it again after changes or an update to rebuild and restart.
|
|
38
39
|
Server tool: https://orionmarket.place/downloads/orionplace.sh
|
|
39
40
|
|
|
41
|
+
Manage the installed service (from the project root, or name it with --name):
|
|
42
|
+
npx orionplace-svelte status service, autostart, port and home page answer
|
|
43
|
+
sudo npx orionplace-svelte start
|
|
44
|
+
sudo npx orionplace-svelte stop
|
|
45
|
+
sudo npx orionplace-svelte restart restart and wait until the home page answers
|
|
46
|
+
sudo npx orionplace-svelte logs [lines] last log lines (100); --follow keeps reading
|
|
47
|
+
npx orionplace-svelte list every storefront service on this server
|
|
48
|
+
sudo npx orionplace-svelte uninstall stop the service and remove it (alias: cleanup);
|
|
49
|
+
the project folder stays
|
|
50
|
+
|
|
40
51
|
Options: --cwd <directory> --dry-run --help --version
|
|
41
52
|
Update option: --local (apply this CLI version instead of fetching the latest release)
|
|
42
|
-
Install options: --name <service> --port <port> --user <user> --no-domains --yes
|
|
53
|
+
Install options: --name <service> --port <port> --user <user> --no-build --no-domains --yes
|
|
54
|
+
Service options: --name <service> --follow (logs) --dry-run --yes (uninstall)
|
|
43
55
|
|
|
44
56
|
Update downloads the latest release, refreshes unedited source, and installs dependencies.
|
|
45
57
|
It preserves edited source, domain mappings and MIMIC. --dry-run leaves project files unchanged.
|
|
@@ -62,11 +74,14 @@ try {
|
|
|
62
74
|
let cwd = process.cwd();
|
|
63
75
|
let dryRun = false;
|
|
64
76
|
let local = false;
|
|
65
|
-
|
|
77
|
+
let follow = false;
|
|
78
|
+
const install = { domains: true, build: true, yes: false };
|
|
66
79
|
for (let index = 0; index < argv.length; index++) {
|
|
67
80
|
if (argv[index] === '--dry-run') dryRun = true;
|
|
68
81
|
else if (argv[index] === '--local') local = true;
|
|
69
82
|
else if (argv[index] === '--no-domains') install.domains = false;
|
|
83
|
+
else if (argv[index] === '--no-build') install.build = false;
|
|
84
|
+
else if (argv[index] === '--follow' || argv[index] === '-f') follow = true;
|
|
70
85
|
else if (argv[index] === '--yes' || argv[index] === '-y') install.yes = true;
|
|
71
86
|
else if (['--name', '--port', '--user'].includes(argv[index])) {
|
|
72
87
|
if (!argv[index + 1]) throw new Error(`${argv[index]} needs a value`);
|
|
@@ -77,11 +92,15 @@ try {
|
|
|
77
92
|
} else if (argv[index].startsWith('--')) throw new Error(`Unknown option: ${argv[index]}`);
|
|
78
93
|
else positional.push(argv[index]);
|
|
79
94
|
}
|
|
80
|
-
const [
|
|
95
|
+
const [given, target] = positional;
|
|
96
|
+
const command = SERVICE_ALIASES[given] || given;
|
|
81
97
|
if (local && command !== 'update') throw new Error('--local is only supported by update.');
|
|
82
|
-
|
|
83
|
-
|
|
98
|
+
const service = SERVICE_ACTIONS.includes(command);
|
|
99
|
+
if (command !== 'install' && (install.port || install.user || !install.domains || !install.build || (install.yes && command !== 'uninstall') || (install.name && !service))) {
|
|
100
|
+
throw new Error('--port, --user, --no-build, --no-domains and --yes are install options (--yes also for uninstall); --name is for install and the service commands.');
|
|
84
101
|
}
|
|
102
|
+
if (follow && command !== 'logs') throw new Error('--follow is a logs option.');
|
|
103
|
+
if (dryRun && service && command !== 'uninstall') throw new Error('--dry-run is only for uninstall among the service commands; status shows the state without changes.');
|
|
85
104
|
let result;
|
|
86
105
|
if (command === 'install' && positional.length === 1) {
|
|
87
106
|
const done = await installService({ cwd, dryRun, ...install });
|
|
@@ -92,14 +111,26 @@ try {
|
|
|
92
111
|
} else {
|
|
93
112
|
console.log(`\nInstalled orionplace-${done.name} (port ${done.port}, user ${done.user}).`);
|
|
94
113
|
for (const domain of done.frontends) {
|
|
95
|
-
if (!
|
|
114
|
+
if (!install.domains) console.log(` - ${domain}: not connected (--no-domains)`);
|
|
115
|
+
else if (!done.connected) console.log(` - ${domain}: not connected to nginx (see above)`);
|
|
96
116
|
else if (done.failed.includes(domain)) console.log(` ✗ ${domain}: not connected (see above)`);
|
|
97
117
|
else console.log(` ✓ https://${domain}`);
|
|
98
118
|
}
|
|
99
119
|
if (done.failed.length) console.log('Fix the problems above, then run: sudo orionplace domain add <domain>');
|
|
100
|
-
console.log(`Manage it
|
|
120
|
+
console.log(`Manage it from this folder: npx orionplace-svelte status | sudo npx orionplace-svelte restart | sudo npx orionplace-svelte logs`);
|
|
101
121
|
console.log('After code changes or npx orionplace-svelte update, run sudo npx orionplace-svelte install again.');
|
|
102
122
|
}
|
|
123
|
+
} else if (service && positional.length <= (command === 'logs' ? 2 : 1)) {
|
|
124
|
+
if (command === 'uninstall' && !dryRun && !install.yes && process.stdin.isTTY) {
|
|
125
|
+
const app = await findApp({ cwd, name: install.name });
|
|
126
|
+
const prompt = createInterface({ input: process.stdin, output: process.stdout });
|
|
127
|
+
let answer;
|
|
128
|
+
try { answer = await prompt.question(`Stop and remove the service orionplace-${app.NAME}? The project stays in ${app.DIR}. [y/N] `); }
|
|
129
|
+
finally { prompt.close(); }
|
|
130
|
+
if (!/^y(es)?$/i.test(answer.trim())) { console.log('Nothing changed.'); process.exit(0); }
|
|
131
|
+
}
|
|
132
|
+
const done = await controlService({ action: command, cwd, name: install.name, lines: positional[1] ?? 100, follow, dryRun });
|
|
133
|
+
process.exitCode = printService(done);
|
|
103
134
|
} else if (command === 'init' && positional.length <= 2) {
|
|
104
135
|
result = await setupProject({ cwd: target ? resolve(cwd, target) : cwd, dryRun });
|
|
105
136
|
} else if (command === 'update' && positional.length === 1) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "orionplace-svelte",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "SvelteKit 2 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English and Russian, plus an Android app build.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
package/runtime/marketplace.mjs
CHANGED
|
@@ -208,6 +208,18 @@ export async function forwardMarketplace(request, configuration = {}) {
|
|
|
208
208
|
}
|
|
209
209
|
}
|
|
210
210
|
headers.set('X-Front-Domain', tenant.domain);
|
|
211
|
+
// The backend accepts forms from the storefront domain's own origin. A public
|
|
212
|
+
// host that shows this storefront (MIMIC, a preview host or a local port)
|
|
213
|
+
// passed the same-origin check above, so it is sent as that origin.
|
|
214
|
+
let ownOrigin = false;
|
|
215
|
+
try {
|
|
216
|
+
ownOrigin = Boolean(origin) && originHosts.includes(new URL(origin).host);
|
|
217
|
+
} catch {
|
|
218
|
+
ownOrigin = false;
|
|
219
|
+
}
|
|
220
|
+
if (ownOrigin) {
|
|
221
|
+
headers.set('origin', `https://${tenant.domain}`);
|
|
222
|
+
}
|
|
211
223
|
headers.set('Accept-Encoding', 'identity');
|
|
212
224
|
const clientIp =
|
|
213
225
|
request.headers.get('x-init-ip') ||
|
package/src/install.mjs
CHANGED
|
@@ -229,7 +229,7 @@ async function ensureDomains(root, { yes }) {
|
|
|
229
229
|
}
|
|
230
230
|
|
|
231
231
|
// The storefront's home page as the public domain sees it -> HTTP status, 0 when down.
|
|
232
|
-
function homeStatus(port, host) {
|
|
232
|
+
export function homeStatus(port, host) {
|
|
233
233
|
return new Promise(done => {
|
|
234
234
|
const call = request({ host: '127.0.0.1', port, path: '/', headers: { host }, timeout: 15000 }, response => {
|
|
235
235
|
response.resume();
|
|
@@ -241,7 +241,7 @@ function homeStatus(port, host) {
|
|
|
241
241
|
});
|
|
242
242
|
}
|
|
243
243
|
|
|
244
|
-
async function waitForHttp(port, host, seconds = 90) {
|
|
244
|
+
export async function waitForHttp(port, host, seconds = 90) {
|
|
245
245
|
const until = Date.now() + seconds * 1000;
|
|
246
246
|
while (Date.now() < until) {
|
|
247
247
|
const status = await homeStatus(port, host);
|
|
@@ -309,7 +309,8 @@ export async function installService({
|
|
|
309
309
|
return { dryRun, name: service, port: chosen, user: account.name, unitPath, unit, conf, frontends: settings.frontends || [], backend: settings.backend };
|
|
310
310
|
}
|
|
311
311
|
|
|
312
|
-
|
|
312
|
+
const rebuild = build || !existsSync(join(root, framework.output));
|
|
313
|
+
log(rebuild ? `\n==> Building the ${framework.title} storefront ${service}` : `\n==> Using the existing build of ${service} (--no-build)`);
|
|
313
314
|
// The website build; ORIONPLACE_APP_ORIGIN would make the Android app build.
|
|
314
315
|
const buildEnv = { ...process.env };
|
|
315
316
|
delete buildEnv.ORIONPLACE_APP_ORIGIN;
|
|
@@ -317,7 +318,7 @@ export async function installService({
|
|
|
317
318
|
const installed = await run('npm', ['install', '--no-audit', '--no-fund'], { cwd: root, env: buildEnv });
|
|
318
319
|
if (installed.code) throw new Error('npm install failed; see the messages above.');
|
|
319
320
|
}
|
|
320
|
-
if (
|
|
321
|
+
if (rebuild) {
|
|
321
322
|
const built = await run('npm', ['run', 'build'], { cwd: root, env: buildEnv });
|
|
322
323
|
if (built.code) throw new Error('The build failed; see the messages above. The running service (if any) was not changed.');
|
|
323
324
|
}
|
package/src/project-readme.mjs
CHANGED
|
@@ -342,6 +342,9 @@ The quickest way: prepare the server with the OrionMarketplace server script,
|
|
|
342
342
|
then run \`sudo npx orionplace-svelte install\` in this folder. It builds the
|
|
343
343
|
project, runs it as a system service and connects your domains with nginx and
|
|
344
344
|
HTTPS. Steps: [Install a storefront](https://orionmarket.place/en/sandbox/install/storefront?framework=svelte).
|
|
345
|
+
Then manage it from this folder: \`npx orionplace-svelte status\`, \`sudo npx orionplace-svelte restart\`,
|
|
346
|
+
\`sudo npx orionplace-svelte stop\`, \`sudo npx orionplace-svelte start\` and \`sudo npx orionplace-svelte logs\`.
|
|
347
|
+
\`sudo npx orionplace-svelte uninstall\` (or \`cleanup\`) stops and removes the service; this folder stays.
|
|
345
348
|
|
|
346
349
|
To set the server up yourself instead:
|
|
347
350
|
|
package/src/service.mjs
ADDED
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
// Manages the storefront service that "install" set up: start, stop, restart,
|
|
2
|
+
// status, logs and the list of every storefront service on this server.
|
|
3
|
+
// The service is found by its folder (the project root) or by --name.
|
|
4
|
+
import { existsSync } from 'node:fs';
|
|
5
|
+
import { readFile, rm } from 'node:fs/promises';
|
|
6
|
+
import { join, resolve } from 'node:path';
|
|
7
|
+
import { defaultPaths, framework, homeStatus, readApps, runCommand, waitForHttp } from './install.mjs';
|
|
8
|
+
|
|
9
|
+
export const SERVICE_ACTIONS = ['start', 'stop', 'restart', 'status', 'logs', 'list', 'uninstall'];
|
|
10
|
+
// "cleanup" is another name for uninstall.
|
|
11
|
+
export const SERVICE_ALIASES = { cleanup: 'uninstall' };
|
|
12
|
+
|
|
13
|
+
async function frontends(dir) {
|
|
14
|
+
try { return JSON.parse(await readFile(join(dir, 'orionplace/settings.json'), 'utf8')).frontends || []; }
|
|
15
|
+
catch { return []; }
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
// The registered storefront of this folder, or the one named with --name.
|
|
19
|
+
export async function findApp({ cwd = process.cwd(), name, paths = defaultPaths } = {}) {
|
|
20
|
+
const apps = await readApps(paths);
|
|
21
|
+
const root = resolve(cwd);
|
|
22
|
+
const app = name ? apps.find(item => item.NAME === name) : apps.find(item => item.DIR === root);
|
|
23
|
+
if (app) return app;
|
|
24
|
+
const known = apps.map(item => item.NAME).join(', ');
|
|
25
|
+
if (name) throw new Error(`No storefront service named ${name}.${known ? ` Installed: ${known}.` : ''}`);
|
|
26
|
+
throw new Error(`${root} is not installed as a service. Install it first: sudo npx orionplace-${framework.id} install`
|
|
27
|
+
+ (known ? `\nOr name another storefront: --name ${apps[0].NAME} (installed: ${known})` : ''));
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// true / false; "unknown" when neither systemd nor OpenRC answers.
|
|
31
|
+
async function isRunning(service, { run, systemd }) {
|
|
32
|
+
const result = systemd
|
|
33
|
+
? await run('systemctl', ['is-active', '--quiet', service], { capture: true })
|
|
34
|
+
: await run('rc-service', [service, 'status'], { capture: true });
|
|
35
|
+
return result.code === 0;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
async function isEnabled(service, { run, systemd }) {
|
|
39
|
+
const result = systemd
|
|
40
|
+
? await run('systemctl', ['is-enabled', '--quiet', service], { capture: true })
|
|
41
|
+
: await run('rc-update', ['show', 'default'], { capture: true });
|
|
42
|
+
return systemd ? result.code === 0 : new RegExp(`^\\s*${service}\\s`, 'm').test(result.output);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
async function lastLogs(app, { run, systemd, paths, lines = 40 }) {
|
|
46
|
+
const result = systemd
|
|
47
|
+
? await run('journalctl', ['-u', app.SERVICE || `orionplace-${app.NAME}`, '-n', String(lines), '--no-pager'], { capture: true })
|
|
48
|
+
: await run('tail', ['-n', String(lines), join(paths.logs, `${app.NAME}.log`)], { capture: true });
|
|
49
|
+
return result.output;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
// One storefront's state: service, autostart, and the home page as its first domain sees it.
|
|
53
|
+
export async function serviceStatus(app, { run = runCommand, systemd = existsSync('/run/systemd/system'), probe = homeStatus } = {}) {
|
|
54
|
+
const service = app.SERVICE || `orionplace-${app.NAME}`;
|
|
55
|
+
const domains = await frontends(app.DIR);
|
|
56
|
+
const running = await isRunning(service, { run, systemd });
|
|
57
|
+
const enabled = await isEnabled(service, { run, systemd });
|
|
58
|
+
const http = running ? await probe(Number(app.PORT), domains[0] || 'localhost') : 0;
|
|
59
|
+
return { name: app.NAME, service, framework: app.FRAMEWORK, dir: app.DIR, port: Number(app.PORT), running, enabled, http, domains };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* controlService({ action, cwd, name, lines, follow }) runs one action and
|
|
64
|
+
* returns what happened; logs and follow print straight to the terminal.
|
|
65
|
+
*/
|
|
66
|
+
export async function controlService({
|
|
67
|
+
action, cwd = process.cwd(), name, lines = 100, follow = false,
|
|
68
|
+
paths = defaultPaths, run = runCommand, uid = process.getuid?.(),
|
|
69
|
+
systemd = existsSync('/run/systemd/system'), openrc = existsSync('/sbin/openrc-run'),
|
|
70
|
+
platform = process.platform, probe = homeStatus, wait = waitForHttp, dryRun = false,
|
|
71
|
+
} = {}) {
|
|
72
|
+
action = SERVICE_ALIASES[action] || action;
|
|
73
|
+
if (!SERVICE_ACTIONS.includes(action)) throw new Error(`Unknown service command ${action}. Use ${SERVICE_ACTIONS.join(', ')}.`);
|
|
74
|
+
if (platform !== 'linux') throw new Error(`${action} manages the Linux service that install set up. Run it on your server.`);
|
|
75
|
+
if (!systemd && !openrc) throw new Error('Neither systemd nor OpenRC was found on this server.');
|
|
76
|
+
|
|
77
|
+
if (action === 'list') {
|
|
78
|
+
const apps = await readApps(paths);
|
|
79
|
+
return { action, apps: await Promise.all(apps.map(app => serviceStatus(app, { run, systemd, probe }))) };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
const app = await findApp({ cwd, name, paths });
|
|
83
|
+
const service = app.SERVICE || `orionplace-${app.NAME}`;
|
|
84
|
+
if (action === 'status') return { action, ...await serviceStatus(app, { run, systemd, probe }) };
|
|
85
|
+
|
|
86
|
+
if (action === 'logs') {
|
|
87
|
+
const count = Number(lines);
|
|
88
|
+
if (!Number.isInteger(count) || count < 1) throw new Error('Give the number of log lines as a whole number, for example: logs 200');
|
|
89
|
+
const args = systemd
|
|
90
|
+
? ['journalctl', ['-u', service, '-n', String(count), '--no-pager', ...(follow ? ['--follow'] : [])]]
|
|
91
|
+
: ['tail', ['-n', String(count), ...(follow ? ['-F'] : []), join(paths.logs, `${app.NAME}.log`)]];
|
|
92
|
+
const result = await run(...args);
|
|
93
|
+
if (result.code) throw new Error(`${args[0]} could not read the logs of ${service}${uid !== 0 ? `; try: sudo npx orionplace-${framework.id} logs` : ''}.`);
|
|
94
|
+
return { action, name: app.NAME, service };
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
if (action === 'uninstall') return uninstallService(app, { paths, run, uid, systemd, name, dryRun });
|
|
98
|
+
if (uid !== 0) throw new Error(`${action} needs root: sudo npx orionplace-${framework.id} ${action}${name ? ` --name ${name}` : ''}`);
|
|
99
|
+
const result = systemd
|
|
100
|
+
? await run('systemctl', [action, service], { capture: true })
|
|
101
|
+
: await run('rc-service', [service, action], { capture: true });
|
|
102
|
+
if (result.code) throw new Error(`Could not ${action} ${service}:\n${result.output.trim()}`);
|
|
103
|
+
if (action === 'stop') return { action, name: app.NAME, service, running: false };
|
|
104
|
+
|
|
105
|
+
const domains = await frontends(app.DIR);
|
|
106
|
+
const http = await wait(Number(app.PORT), domains[0] || 'localhost', 90);
|
|
107
|
+
if (!http) {
|
|
108
|
+
throw new Error(`${service} did not answer on port ${app.PORT} within 90 seconds. Last log lines:\n${await lastLogs(app, { run, systemd, paths })}`);
|
|
109
|
+
}
|
|
110
|
+
return { action, name: app.NAME, service, port: Number(app.PORT), running: true, http, domains };
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Stops the service, removes it from autostart, deletes its unit or init
|
|
115
|
+
* script and its registration. The project folder and its build stay. With
|
|
116
|
+
* the orionplace server tool, "orionplace app remove" does it and also turns
|
|
117
|
+
* the storefront's domains into a placeholder page.
|
|
118
|
+
*/
|
|
119
|
+
async function uninstallService(app, { paths, run, uid, systemd, name, dryRun }) {
|
|
120
|
+
const service = app.SERVICE || `orionplace-${app.NAME}`;
|
|
121
|
+
const unitPath = systemd ? join(paths.systemd, `${service}.service`) : join(paths.openrc, service);
|
|
122
|
+
const confPath = join(paths.etc, 'apps', `${app.NAME}.conf`);
|
|
123
|
+
const tool = (paths.tool || []).find(path => existsSync(path));
|
|
124
|
+
const result = { action: 'uninstall', name: app.NAME, service, dir: app.DIR, domains: await frontends(app.DIR), tool: Boolean(tool), unitPath, confPath, dryRun };
|
|
125
|
+
if (dryRun) return result;
|
|
126
|
+
if (uid !== 0) throw new Error(`uninstall needs root: sudo npx orionplace-${framework.id} uninstall${name ? ` --name ${name}` : ''}`);
|
|
127
|
+
if (tool) {
|
|
128
|
+
const removed = await run(tool, ['app', 'remove', app.NAME, '--yes']);
|
|
129
|
+
if (removed.code) throw new Error(`orionplace app remove ${app.NAME} failed; see the messages above.`);
|
|
130
|
+
return result;
|
|
131
|
+
}
|
|
132
|
+
// A service that is already stopped or missing is fine: the goal is that it is gone.
|
|
133
|
+
if (systemd) await run('systemctl', ['disable', '--now', service], { capture: true });
|
|
134
|
+
else {
|
|
135
|
+
await run('rc-service', [service, 'stop'], { capture: true });
|
|
136
|
+
await run('rc-update', ['del', service, 'default'], { capture: true });
|
|
137
|
+
}
|
|
138
|
+
await rm(unitPath, { force: true });
|
|
139
|
+
if (systemd) await run('systemctl', ['daemon-reload'], { capture: true });
|
|
140
|
+
await rm(confPath, { force: true });
|
|
141
|
+
return result;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// The CLI output of controlService; returns the process exit code.
|
|
145
|
+
export function printService(result, log = console.log) {
|
|
146
|
+
const line = item => {
|
|
147
|
+
const state = item.running ? (item.http ? `running, home page HTTP ${item.http}` : 'running, home page does not answer') : 'stopped';
|
|
148
|
+
return `${item.name.padEnd(16)} ${String(item.framework || '').padEnd(7)} ${String(item.port).padEnd(6)} ${state}`;
|
|
149
|
+
};
|
|
150
|
+
if (result.action === 'list') {
|
|
151
|
+
if (!result.apps.length) {
|
|
152
|
+
log(`No storefront services on this server. Install one from its folder: sudo npx orionplace-${framework.id} install`);
|
|
153
|
+
return 0;
|
|
154
|
+
}
|
|
155
|
+
log(`${'NAME'.padEnd(16)} ${'TYPE'.padEnd(7)} ${'PORT'.padEnd(6)} STATE`);
|
|
156
|
+
for (const item of result.apps) log(line(item));
|
|
157
|
+
return 0;
|
|
158
|
+
}
|
|
159
|
+
if (result.action === 'status') {
|
|
160
|
+
log(`${result.service} (${result.framework || framework.id}) in ${result.dir}`);
|
|
161
|
+
log(` Service: ${result.running ? 'running' : 'stopped'}${result.enabled ? ', starts with the server' : ', does not start with the server'}`);
|
|
162
|
+
log(` Port: 127.0.0.1:${result.port}`);
|
|
163
|
+
log(` Home page: ${result.running ? (result.http ? `HTTP ${result.http}` : 'does not answer') : '-'}`);
|
|
164
|
+
for (const domain of result.domains) log(` Domain: https://${domain}`);
|
|
165
|
+
return result.running && result.http && result.http < 500 ? 0 : 3;
|
|
166
|
+
}
|
|
167
|
+
if (result.action === 'uninstall') {
|
|
168
|
+
if (result.dryRun) {
|
|
169
|
+
log(`Would stop and remove ${result.service}:`);
|
|
170
|
+
log(result.tool ? ` orionplace app remove ${result.name} --yes (also turns its domains into a placeholder)` : ` ${result.unitPath}\n ${result.confPath}`);
|
|
171
|
+
log(`The project stays in ${result.dir}.`);
|
|
172
|
+
return 0;
|
|
173
|
+
}
|
|
174
|
+
log(`Removed the service ${result.service}. The project and its build stay in ${result.dir}; delete the folder when you no longer need it.`);
|
|
175
|
+
if (!result.tool && result.domains.length) {
|
|
176
|
+
log(`nginx still sends ${result.domains.join(', ')} to the stopped service; remove those sites from your nginx configuration.`);
|
|
177
|
+
}
|
|
178
|
+
log(`Install it again with: sudo npx orionplace-${framework.id} install`);
|
|
179
|
+
return 0;
|
|
180
|
+
}
|
|
181
|
+
if (result.action === 'stop') log(`Stopped ${result.service}.`);
|
|
182
|
+
else if (result.action === 'start' || result.action === 'restart') {
|
|
183
|
+
log(`${result.action === 'start' ? 'Started' : 'Restarted'} ${result.service}: home page HTTP ${result.http} on 127.0.0.1:${result.port}.`);
|
|
184
|
+
}
|
|
185
|
+
return 0;
|
|
186
|
+
}
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
tariffMediaItems,
|
|
23
23
|
tariffPagePath,
|
|
24
24
|
} from '@/lib/utils/orionplace/tariffPage';
|
|
25
|
+
import { tariffResumable } from '@/lib/utils/orionplace/tariffs';
|
|
25
26
|
import {
|
|
26
27
|
getAvailableNestedValueFromObject,
|
|
27
28
|
plainText,
|
|
@@ -102,6 +103,18 @@
|
|
|
102
103
|
const tariff = computed(() =>
|
|
103
104
|
confirmed.value ? catalogStore.getTariff(inputs.tariffId) : undefined,
|
|
104
105
|
);
|
|
106
|
+
/*
|
|
107
|
+
* A trial chosen before sign-in opens again only once the customer's
|
|
108
|
+
* subscription records are known and the customer is new to this one;
|
|
109
|
+
* the backend refuses a trial to a returning customer.
|
|
110
|
+
*/
|
|
111
|
+
const resumable = computed(() =>
|
|
112
|
+
tariffResumable(
|
|
113
|
+
inputs.resume,
|
|
114
|
+
tariff.value,
|
|
115
|
+
catalogStore.usedSubscriptionsOf(store.profile?.id),
|
|
116
|
+
),
|
|
117
|
+
);
|
|
105
118
|
// The heading names the plan; `tariff_title` is its SEO page title.
|
|
106
119
|
const title = computed(
|
|
107
120
|
() =>
|
|
@@ -218,6 +231,7 @@
|
|
|
218
231
|
if (!confirmed.value) {
|
|
219
232
|
void load();
|
|
220
233
|
}
|
|
234
|
+
void account.loadUsed();
|
|
221
235
|
});
|
|
222
236
|
|
|
223
237
|
watch(media, () => {
|
|
@@ -229,7 +243,13 @@
|
|
|
229
243
|
}
|
|
230
244
|
});
|
|
231
245
|
watch(
|
|
232
|
-
() =>
|
|
246
|
+
() => store.profile?.id,
|
|
247
|
+
() => {
|
|
248
|
+
void account.loadUsed();
|
|
249
|
+
},
|
|
250
|
+
);
|
|
251
|
+
watch(
|
|
252
|
+
resumable,
|
|
233
253
|
(value) => {
|
|
234
254
|
if (
|
|
235
255
|
value?.tariff === inputs.tariffId &&
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import { routeHref } from '@/lib/orionplace/navigation.svelte';
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
computed,
|
|
5
|
+
onMounted,
|
|
6
|
+
ref,
|
|
7
|
+
watch,
|
|
8
|
+
} from '@/lib/orionplace/reactivity.svelte';
|
|
4
9
|
import { useOrionplaceStore } from '@/lib/stores/orionplace.svelte';
|
|
5
10
|
import { useOrionplaceCatalogStore } from '@/lib/stores/orionplaceCatalog.svelte';
|
|
6
11
|
import { useOrionplaceSelectionsStore } from '@/lib/stores/orionplaceSelections.svelte';
|
|
7
12
|
import { useOrionplaceSubscriptions } from '@/lib/composables/useOrionplaceSubscriptions.svelte';
|
|
13
|
+
import { tariffResumable } from '@/lib/utils/orionplace/tariffs';
|
|
8
14
|
import {
|
|
9
15
|
useOrionplaceFeatureApi,
|
|
10
16
|
useOrionplaceTask,
|
|
@@ -60,7 +66,20 @@
|
|
|
60
66
|
const busy = computed(() =>
|
|
61
67
|
Boolean(task.state.pending || account.task.state.pending),
|
|
62
68
|
);
|
|
63
|
-
|
|
69
|
+
/*
|
|
70
|
+
* The choice to reopen after sign-in. A trial waits for the customer's
|
|
71
|
+
* subscription records and opens only for a customer new to the record;
|
|
72
|
+
* the backend refuses a trial to a returning customer.
|
|
73
|
+
*/
|
|
74
|
+
const open = computed(() =>
|
|
75
|
+
guest.value
|
|
76
|
+
? undefined
|
|
77
|
+
: tariffResumable(
|
|
78
|
+
inputs.resume,
|
|
79
|
+
inputs.resume && catalogStore.getTariff(inputs.resume.tariff),
|
|
80
|
+
catalogStore.usedSubscriptionsOf(store.profile?.id),
|
|
81
|
+
),
|
|
82
|
+
);
|
|
64
83
|
// The plans this page shows: every loaded plan, or only the requested IDs.
|
|
65
84
|
const shown = computed(() => {
|
|
66
85
|
const data = catalogStore.tariffs?.data ?? [];
|
|
@@ -154,7 +173,14 @@
|
|
|
154
173
|
if (!catalogStore.tariffs || catalogStore.tariffsSnapshot) {
|
|
155
174
|
void load();
|
|
156
175
|
}
|
|
176
|
+
void account.loadUsed();
|
|
157
177
|
});
|
|
178
|
+
watch(
|
|
179
|
+
() => store.profile?.id,
|
|
180
|
+
() => {
|
|
181
|
+
void account.loadUsed();
|
|
182
|
+
},
|
|
183
|
+
);
|
|
158
184
|
</script>
|
|
159
185
|
|
|
160
186
|
<section
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
import { routeHref } from '@/lib/orionplace/navigation.svelte';
|
|
3
3
|
import type { Snippet } from 'svelte';
|
|
4
4
|
import { computed, ref, watch } from '@/lib/orionplace/reactivity.svelte';
|
|
5
|
+
import { useOrionplaceStore } from '@/lib/stores/orionplace.svelte';
|
|
5
6
|
import { useOrionplaceCatalogStore } from '@/lib/stores/orionplaceCatalog.svelte';
|
|
6
7
|
import { useOrionplaceSelectionsStore } from '@/lib/stores/orionplaceSelections.svelte';
|
|
7
8
|
import {
|
|
8
9
|
tariffIsOpen,
|
|
9
10
|
tariffSubscribeRequest,
|
|
11
|
+
tariffTrialOpen,
|
|
10
12
|
} from '@/lib/utils/orionplace/tariffs';
|
|
11
13
|
import {
|
|
12
14
|
tariffDays,
|
|
@@ -121,6 +123,7 @@
|
|
|
121
123
|
return handlers[event]?.(...args);
|
|
122
124
|
};
|
|
123
125
|
|
|
126
|
+
const store = useOrionplaceStore();
|
|
124
127
|
const catalogStore = useOrionplaceCatalogStore();
|
|
125
128
|
const selectionStore = useOrionplaceSelectionsStore();
|
|
126
129
|
const tariff = computed(() => catalogStore.getTariff(inputs.tariffId));
|
|
@@ -135,15 +138,22 @@
|
|
|
135
138
|
// The option chosen in the card; the dialog opens on it and keeps its own
|
|
136
139
|
// choice from there.
|
|
137
140
|
const optionId = ref<number>();
|
|
141
|
+
// No trial badge for a customer who already had this subscription record.
|
|
138
142
|
const trialBadge = computed(() => {
|
|
139
|
-
const
|
|
143
|
+
const value = tariff.value;
|
|
140
144
|
|
|
141
|
-
if (
|
|
145
|
+
if (
|
|
146
|
+
!value ||
|
|
147
|
+
!tariffTrialOpen(
|
|
148
|
+
value,
|
|
149
|
+
catalogStore.usedSubscriptionsOf(store.profile?.id),
|
|
150
|
+
)
|
|
151
|
+
) {
|
|
142
152
|
return '';
|
|
143
153
|
}
|
|
144
154
|
|
|
145
155
|
return tariffText(tariffLabels(selectionStore.localeCode).trialBadge, {
|
|
146
|
-
days: tariffDays(
|
|
156
|
+
days: tariffDays(value.trial_days, selectionStore.localeCode),
|
|
147
157
|
});
|
|
148
158
|
});
|
|
149
159
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Plan prices
|
|
2
2
|
|
|
3
|
-
The period switcher, the price for the chosen period and the Subscribe and Try actions. A plan that only the store administrator assigns, or a closed plan, shows a note instead of actions.
|
|
3
|
+
The period switcher, the price for the chosen period and the Subscribe and Try actions. A plan that only the store administrator assigns, or a closed plan, shows a note instead of actions. A signed-in customer who already had the plan's subscription sees no Try action and no trial badge: the backend gives a trial once per subscription. The plan pages load the customer's records with `subscriptions_get`; until they arrive, the trial stays shown.
|
|
4
4
|
|
|
5
5
|
Source: `src/lib/components/orionplace/tariffs/TariffCardPrices.svelte`.
|
|
6
6
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import { modelCell } from '@/lib/orionplace/reactivity.svelte';
|
|
3
3
|
import { computed } from '@/lib/orionplace/reactivity.svelte';
|
|
4
|
+
import { useOrionplaceStore } from '@/lib/stores/orionplace.svelte';
|
|
4
5
|
import { useOrionplaceCatalogStore } from '@/lib/stores/orionplaceCatalog.svelte';
|
|
5
6
|
import { useOrionplaceSelectionsStore } from '@/lib/stores/orionplaceSelections.svelte';
|
|
6
7
|
import { useOrionplaceSignIn } from '@/lib/composables/useOrionplaceSignIn.svelte';
|
|
@@ -10,6 +11,7 @@
|
|
|
10
11
|
tariffMoney,
|
|
11
12
|
tariffPaidPeriods,
|
|
12
13
|
tariffReturnPath,
|
|
14
|
+
tariffTrialOpen,
|
|
13
15
|
} from '@/lib/utils/orionplace/tariffs';
|
|
14
16
|
import {
|
|
15
17
|
tariffDays,
|
|
@@ -83,6 +85,7 @@
|
|
|
83
85
|
},
|
|
84
86
|
);
|
|
85
87
|
|
|
88
|
+
const store = useOrionplaceStore();
|
|
86
89
|
const catalogStore = useOrionplaceCatalogStore();
|
|
87
90
|
const selectionStore = useOrionplaceSelectionsStore();
|
|
88
91
|
const signIn = useOrionplaceSignIn();
|
|
@@ -122,11 +125,24 @@
|
|
|
122
125
|
paidPeriods.value.find((item) => item.price === selectedPeriod.value) ??
|
|
123
126
|
paidPeriods.value[0],
|
|
124
127
|
);
|
|
125
|
-
|
|
126
|
-
|
|
128
|
+
// A customer who already had this subscription record gets no trial.
|
|
129
|
+
const trialUsed = computed(() => {
|
|
130
|
+
const value = tariff.value;
|
|
127
131
|
|
|
128
|
-
return
|
|
132
|
+
return Boolean(
|
|
133
|
+
value &&
|
|
134
|
+
value.trial_days > 0 &&
|
|
135
|
+
!tariffTrialOpen(
|
|
136
|
+
value,
|
|
137
|
+
catalogStore.usedSubscriptionsOf(store.profile?.id),
|
|
138
|
+
),
|
|
139
|
+
);
|
|
129
140
|
});
|
|
141
|
+
const trialDuration = computed(() =>
|
|
142
|
+
tariff.value && !trialUsed.value && tariff.value.trial_days > 0
|
|
143
|
+
? duration(tariff.value.trial_days)
|
|
144
|
+
: '',
|
|
145
|
+
);
|
|
130
146
|
const actions = computed(() => {
|
|
131
147
|
const list: TariffPeriodAction[] = [];
|
|
132
148
|
|
|
@@ -165,7 +181,11 @@
|
|
|
165
181
|
return copy.value.closed;
|
|
166
182
|
}
|
|
167
183
|
|
|
168
|
-
|
|
184
|
+
if (actions.value.length) {
|
|
185
|
+
return '';
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
return trialUsed.value ? copy.value.trialUsed : copy.value.noPeriods;
|
|
169
189
|
});
|
|
170
190
|
const actionClasses = `
|
|
171
191
|
box-border inline-flex h-11 w-full items-center justify-center px-6
|
|
@@ -5,11 +5,13 @@ import {
|
|
|
5
5
|
watch,
|
|
6
6
|
} from '@/lib/orionplace/reactivity.svelte';
|
|
7
7
|
import { useOrionplaceStore } from '@/lib/stores/orionplace.svelte';
|
|
8
|
+
import { useOrionplaceCatalogStore } from '@/lib/stores/orionplaceCatalog.svelte';
|
|
8
9
|
import {
|
|
9
10
|
useOrionplaceFeatureApi,
|
|
10
11
|
useOrionplaceTask,
|
|
11
12
|
} from '@/lib/composables/useOrionplaceFeature.svelte';
|
|
12
13
|
import { useOrionplaceSignIn } from '@/lib/composables/useOrionplaceSignIn.svelte';
|
|
14
|
+
import { tariffUsedSubscriptions } from '@/lib/utils/orionplace/tariffs';
|
|
13
15
|
import type {
|
|
14
16
|
ICustomerSubscription,
|
|
15
17
|
ICustomerSubscriptionsResponse,
|
|
@@ -24,6 +26,7 @@ import type { IProfileData } from '@/lib/interfaces/orionplace/accounts/IProfile
|
|
|
24
26
|
|
|
25
27
|
export function useOrionplaceSubscriptions(loadOnMount = true) {
|
|
26
28
|
const store = useOrionplaceStore();
|
|
29
|
+
const catalogStore = useOrionplaceCatalogStore();
|
|
27
30
|
const api = useOrionplaceFeatureApi();
|
|
28
31
|
const task = useOrionplaceTask();
|
|
29
32
|
const signIn = useOrionplaceSignIn();
|
|
@@ -43,6 +46,7 @@ export function useOrionplaceSubscriptions(loadOnMount = true) {
|
|
|
43
46
|
subscriptions.value = result.data;
|
|
44
47
|
tariffs.value = result.tariffs;
|
|
45
48
|
loaded.value = true;
|
|
49
|
+
rememberUsed(result);
|
|
46
50
|
const profileData = await api.request<{ profile_info: IProfileData[] }>(
|
|
47
51
|
'profile_get',
|
|
48
52
|
{ filters: {} },
|
|
@@ -63,6 +67,44 @@ export function useOrionplaceSubscriptions(loadOnMount = true) {
|
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
|
|
70
|
+
function rememberUsed(
|
|
71
|
+
result: NonNullable<ICustomerSubscriptionsResponse['page_data']>,
|
|
72
|
+
) {
|
|
73
|
+
if (store.profile) {
|
|
74
|
+
catalogStore.setUsedSubscriptions(
|
|
75
|
+
store.profile.id,
|
|
76
|
+
tariffUsedSubscriptions(result),
|
|
77
|
+
);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/*
|
|
82
|
+
* The plan pages hide the trial of a subscription record the customer
|
|
83
|
+
* already had (the backend refuses it). They read the records once per
|
|
84
|
+
* profile; a failed read leaves the trial shown, as for an unknown customer.
|
|
85
|
+
*/
|
|
86
|
+
async function loadUsed() {
|
|
87
|
+
const profile = store.profile?.id;
|
|
88
|
+
|
|
89
|
+
if (
|
|
90
|
+
!store.isAuthenticated ||
|
|
91
|
+
profile === undefined ||
|
|
92
|
+
catalogStore.usedSubscriptionsOf(profile)
|
|
93
|
+
) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
try {
|
|
97
|
+
rememberUsed(
|
|
98
|
+
await api.request<NonNullable<ICustomerSubscriptionsResponse['page_data']>>(
|
|
99
|
+
'subscriptions_get',
|
|
100
|
+
{},
|
|
101
|
+
),
|
|
102
|
+
);
|
|
103
|
+
} catch {
|
|
104
|
+
catalogStore.setUsedSubscriptions(profile, []);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
66
108
|
/*
|
|
67
109
|
* Each plan the customer buys is its own subscription, so a purchase that
|
|
68
110
|
* already succeeded must not block the next one. Only repeating the same
|
|
@@ -211,6 +253,7 @@ export function useOrionplaceSubscriptions(loadOnMount = true) {
|
|
|
211
253
|
completed,
|
|
212
254
|
needsRefresh,
|
|
213
255
|
load,
|
|
256
|
+
loadUsed,
|
|
214
257
|
subscribe,
|
|
215
258
|
renew,
|
|
216
259
|
setRenewal,
|
|
@@ -17,6 +17,9 @@ import { resolveAppLoadProducts } from '@/lib/utils/orionplace/productSeller';
|
|
|
17
17
|
* `storeTariffs` is every plan the storefront sells; the subscriptions page
|
|
18
18
|
* and its dialogs read it. `tariffs` is what the plan pages show: the same
|
|
19
19
|
* list, or a search result or one plan set with `setTariffs`.
|
|
20
|
+
* `usedSubscriptions` holds the subscription records the signed-in customer
|
|
21
|
+
* already had, for the profile that loaded them; a new Application Load
|
|
22
|
+
* keeps it, another profile ignores it.
|
|
20
23
|
*/
|
|
21
24
|
export function useOrionplaceCatalog(
|
|
22
25
|
scope: string,
|
|
@@ -30,6 +33,8 @@ export function useOrionplaceCatalog(
|
|
|
30
33
|
shallowRef<NonNullable<IAppLoadCommon['tariffs']>>();
|
|
31
34
|
const storeTariffsSnapshot =
|
|
32
35
|
shallowRef<NonNullable<IAppLoadCommon['tariffs']>>();
|
|
36
|
+
const usedSubscriptions =
|
|
37
|
+
shallowRef<{ profile: number; ids: number[] }>();
|
|
33
38
|
const catalog = computed(
|
|
34
39
|
() => catalogSnapshot.value ?? init.value?.catalog ?? [],
|
|
35
40
|
);
|
|
@@ -71,6 +76,19 @@ export function useOrionplaceCatalog(
|
|
|
71
76
|
tariffsSnapshot.value = undefined;
|
|
72
77
|
}
|
|
73
78
|
|
|
79
|
+
/** The records the customer had, see `tariffUsedSubscriptions`. */
|
|
80
|
+
function setUsedSubscriptions(profile: number, ids: number[]) {
|
|
81
|
+
usedSubscriptions.value = { profile, ids };
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/** Those records for this profile; undefined until they are loaded. */
|
|
85
|
+
function usedSubscriptionsOf(profile: number | undefined) {
|
|
86
|
+
return usedSubscriptions.value &&
|
|
87
|
+
usedSubscriptions.value.profile === profile
|
|
88
|
+
? usedSubscriptions.value.ids
|
|
89
|
+
: undefined;
|
|
90
|
+
}
|
|
91
|
+
|
|
74
92
|
function getTariff(id: number) {
|
|
75
93
|
return tariffs.value?.data.find((tariff) => tariff.id === id);
|
|
76
94
|
}
|
|
@@ -97,6 +115,7 @@ export function useOrionplaceCatalog(
|
|
|
97
115
|
catalogSnapshot,
|
|
98
116
|
tariffsSnapshot,
|
|
99
117
|
storeTariffsSnapshot,
|
|
118
|
+
usedSubscriptions,
|
|
100
119
|
catalog,
|
|
101
120
|
tariffs,
|
|
102
121
|
storeTariffs,
|
|
@@ -108,6 +127,8 @@ export function useOrionplaceCatalog(
|
|
|
108
127
|
setCatalogTree,
|
|
109
128
|
setTariffs,
|
|
110
129
|
setStoreTariffs,
|
|
130
|
+
setUsedSubscriptions,
|
|
131
|
+
usedSubscriptionsOf,
|
|
111
132
|
getTariff,
|
|
112
133
|
getCatalogCategory,
|
|
113
134
|
getCatalogProducts,
|
|
@@ -9,6 +9,7 @@ const labels = {
|
|
|
9
9
|
adminOnly:
|
|
10
10
|
'This plan is assigned by the store administrator. It cannot be subscribed to online.',
|
|
11
11
|
closed: 'New subscriptions to this plan are closed.',
|
|
12
|
+
trialUsed: 'You have already used the trial of this subscription.',
|
|
12
13
|
subscribe: 'Subscribe',
|
|
13
14
|
tryTrial: 'Try',
|
|
14
15
|
perPeriod: 'for {days}',
|
|
@@ -56,6 +57,7 @@ const labels = {
|
|
|
56
57
|
adminOnly:
|
|
57
58
|
'Этот тариф подключает администратор магазина. Самостоятельное подключение недоступно.',
|
|
58
59
|
closed: 'Новые подключения к этому тарифу закрыты.',
|
|
60
|
+
trialUsed: 'Пробный период этой подписки вы уже использовали.',
|
|
59
61
|
subscribe: 'Подключить',
|
|
60
62
|
tryTrial: 'Попробовать',
|
|
61
63
|
perPeriod: 'за {days}',
|
|
@@ -201,6 +201,55 @@ export function tariffSubscribeRequest(
|
|
|
201
201
|
};
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
+
/**
|
|
205
|
+
* The subscription records the customer already had a period of, paid or
|
|
206
|
+
* trial, read from the `subscriptions_get` response. The backend gives a trial
|
|
207
|
+
* only to a customer new to the record, so the plans of these records offer
|
|
208
|
+
* none.
|
|
209
|
+
*/
|
|
210
|
+
export function tariffUsedSubscriptions(page: {
|
|
211
|
+
data: { subscription: number | null; tariff: number | null }[];
|
|
212
|
+
tariffs: { id: number; subscription: number }[];
|
|
213
|
+
}) {
|
|
214
|
+
const ids = page.data.map(
|
|
215
|
+
(item) =>
|
|
216
|
+
item.subscription ??
|
|
217
|
+
page.tariffs.find((tariff) => tariff.id === item.tariff)?.subscription,
|
|
218
|
+
);
|
|
219
|
+
|
|
220
|
+
return [...new Set(ids.filter((id): id is number => typeof id === 'number'))];
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
/**
|
|
224
|
+
* Whether the plan offers its trial: it has trial days and the customer is
|
|
225
|
+
* not known to have had its subscription record (`used`, see
|
|
226
|
+
* `tariffUsedSubscriptions`). A guest and a customer whose records are not
|
|
227
|
+
* loaded yet see the trial; the backend refuses it to a returning customer.
|
|
228
|
+
*/
|
|
229
|
+
export function tariffTrialOpen(
|
|
230
|
+
tariff: ISubscribeTariff,
|
|
231
|
+
used: readonly number[] = [],
|
|
232
|
+
) {
|
|
233
|
+
return tariff.trial_days > 0 && !used.includes(tariff.subscription);
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* The plan choice to open again after sign-in: a paid period as it is, a
|
|
238
|
+
* trial only once the customer's records are loaded (`used`) and the
|
|
239
|
+
* customer is new to the record.
|
|
240
|
+
*/
|
|
241
|
+
export function tariffResumable(
|
|
242
|
+
selection: ITariffSelection | undefined,
|
|
243
|
+
tariff: ISubscribeTariff | undefined,
|
|
244
|
+
used: readonly number[] | undefined,
|
|
245
|
+
) {
|
|
246
|
+
if (!selection || selection.price !== null) {
|
|
247
|
+
return selection;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
return tariff && used && tariffTrialOpen(tariff, used) ? selection : undefined;
|
|
251
|
+
}
|
|
252
|
+
|
|
204
253
|
export interface ITariffFeature {
|
|
205
254
|
key: string;
|
|
206
255
|
label: string;
|