wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 6492-replaceProcedure

This commit is contained in:
Jorge Penadés 2024-04-10 10:36:06 +00:00
parent 59ea7b335b 1414b6c96e
commit 17243878f9
24 changed files with 71 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Jenkinsfile vendored
View File

@ -1,5 +1,27 @@
#!/usr/bin/env groovy
def BRANCH_ENV = [
test: 'test',
master: 'production'
]
node {
stage('Setup') {
env.MAIN_REPLICAS = 1
env.CRON_REPLICAS = 0
env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
switch (env.BRANCH_NAME) {
case 'master':
env.MAIN_REPLICAS = 3
env.CRON_REPLICAS = 1
break
}
echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}"
}
}
pipeline {
agent any
environment {
@ -7,28 +29,6 @@ pipeline {
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
}
stages {
stage('Checkout') {
steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
switch (env.BRANCH_NAME) {
case 'master':
env.NODE_ENV = 'production'
env.MAIN_REPLICAS = 3
env.CRON_REPLICAS = 1
break
case 'test':
env.NODE_ENV = 'test'
env.MAIN_REPLICAS = 1
env.CRON_REPLICAS = 0
break
}
}
setEnv()
}
}
stage('Debuild') {
when {
anyOf {
@ -60,6 +60,10 @@ pipeline {
CREDS = credentials('docker-registry')
}
steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
}
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel'
sh 'docker-compose push'
@ -76,12 +80,17 @@ pipeline {
DOCKER_HOST = "${env.SWARM_HOST}"
}
steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
}
sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
}
}
}
post {
unsuccessful {
setEnv()
sendEmail()
}
}

41
README.md
View File

@ -1,36 +1,55 @@
# Hedera
Hedera is the main web page for Verdnatura.
Hedera is the main web shop page for Verdnatura.
## Getting Started
## Prerequisites
Required dependencies.
Required applications.
* PHP >= 7.0
* Node.js >= 8.0
* [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib)
### Web application
### Installing dependencies and launching
Launch fronted.
Pull from repository.
Run this commands on project root directory to install Node dependencies.
```
npm run front
$ npm install
```
Launch backend.
Install project dependences (debian/control).
Pull from repository [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib) and install [dependences](https://gitea.verdnatura.es/verdnatura/php-vn-lib/src/branch/master/debian/control) of this project.
Configure config.php file.
Launch project fronted.
```
npm run db
npm run back
php -S 127.0.0.1:3001 -t . index.php
$ npm run front
```
Launch salix backend.
```
$ npm run db
$ npm run back
```
Launch project backend.
```
$ php -S 127.0.0.1:3001 -t . index.php
```
### Command line
Run server side method from command line.
```
php hedera-web.php -m method_path
$ php hedera-web.php -m method_path
```
## Built with
* [nodejs](https://nodejs.org/)
* [php](https://www.php.net/)
* [Webpack](https://webpack.js.org/)
* [MooTools](https://mootools.net/)
* [TinyMCE](https://www.tinymce.com/)

2
config.php
View File

@ -12,6 +12,8 @@
*
* - http://www.mydomain.org -> config.www.php
* - http://test.mydomain.org -> config.test.php
*
* Put the password in base64.
*/
return [
/**

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (23.40.6) stable; urgency=low
hedera-web (24.8.2) stable; urgency=low
* Initial Release.

4
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.7'
services:
main:
image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
image: registry.verdnatura.es/hedera-web:${VERSION:?}
build:
context: .
dockerfile: Dockerfile
@ -25,7 +25,7 @@ services:
limits:
memory: 2G
cron:
image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
image: registry.verdnatura.es/hedera-web:${VERSION:?}
command: 'cron -f'
configs:
- source: config

7
forms/agencies/packages/index.js
View File

@ -3,12 +3,5 @@ import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml'),
onShowClick(column, agencyId) {
this.hash.setAll({
form: 'agencies/provinces',
agency: agencyId
});
}
});

1
forms/agencies/packages/locale/ca.yml
View File

@ -1,5 +1,4 @@
ListByAgency: Paquets per agència
ShowByProvince: Mostrar desglose per província
Agency: Agència
Exps: Exps.
Bundles: Paquets

1
forms/agencies/packages/locale/en.yml
View File

@ -1,5 +1,4 @@
ListByAgency: Bundles by agency
ShowByProvince: Show breakdown by province
Agency: Agency
Exps: Exps.
Bundles: Bundles

1
forms/agencies/packages/locale/es.yml
View File

@ -1,5 +1,4 @@
ListByAgency: Bultos por agencia
ShowByProvince: Mostrar desglose por provincia
Agency: Agencia
Exps: Exps.
Bundles: Bultos

1
forms/agencies/packages/locale/fr.yml
View File

@ -1,5 +1,4 @@
ListByAgency: Liste par agence
ShowByProvince: Montrer par province
Agency: Agence
Exps: Expéditeur
Bundles: Cartons

1
forms/agencies/packages/locale/pt.yml
View File

@ -1,5 +1,4 @@
ListByAgency: Bultos por agencia
ShowByProvince: Mostrar desglosse por Distrito
Agency: Agencia
Exps: Exps.
Bundles: Bultos

5
forms/agencies/packages/ui.xml
View File

@ -10,11 +10,6 @@
CALL vn.agencyVolume()
</custom>
</db-model>
<htk-column-button
column="agency_id"
icon="search"
tip="_ShowByProvince"
on-clicked="onShowClick"/>
<htk-column-text title="_Agency" column="Agencia"/>
<htk-column-spin title="_Exps" column="expediciones"/>
<htk-column-spin title="_Bundles" column="Bultos"/>

7
forms/agencies/provinces/index.js
View File

@ -1,7 +0,0 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
});

6
forms/agencies/provinces/locale/ca.yml
View File

@ -1,6 +0,0 @@
ByProvince: Desglose per província
Return: Tornar
SelectAgency: Selecciona una agència al llistat de l'esquerra
Province: Província
Expeditions: Exps.
Left: Falten

6
forms/agencies/provinces/locale/en.yml
View File

@ -1,6 +0,0 @@
ByProvince: Breakdown by province
Return: Return
SelectAgency: Select an agency
Province: Province
Expeditions: Exps.
Left: Left

6
forms/agencies/provinces/locale/es.yml
View File

@ -1,6 +0,0 @@
ByProvince: Desglose por provincia
Return: Volver
SelectAgency: Selecciona una agencia
Province: Provincia
Expeditions: Exps.
Left: Faltan

6
forms/agencies/provinces/locale/fr.yml
View File

@ -1,6 +0,0 @@
ByProvince: Par province
Return: Retour
SelectAgency: Sélectionnez une agence
Province: Province
Expeditions: Expéditions
Left: Restant

6
forms/agencies/provinces/locale/pt.yml
View File

@ -1,6 +0,0 @@
ByProvince: Desglosse por Distritos
Return: Voltar
SelectAgency: Seleccione uma agência
Province: Distrito
Expeditions: Exps.
Left: Faltam

0
forms/agencies/provinces/style.scss
View File

18
forms/agencies/provinces/ui.xml
View File

@ -1,18 +0,0 @@
<vn>
<div id="title">
<h1><t>ByProvince</t></h1>
</div>
<div id="form" class="provinces vn-w-sm">
<div class="box">
<htk-grid>
<db-model property="model" lot="hash">
CALL vn2008.desglose_volume(#agency)
</db-model>
<htk-column-text title="_Province" column="Provincia"/>
<htk-column-spin title="_Expeditions" column="expediciones"/>
<htk-column-spin title="_Bundles" column="Bultos"/>
<htk-column-spin title="_Left" column="Prevision"/>
</htk-grid>
</div>
</div>
</vn>

4
import.js
View File

@ -40,9 +40,7 @@ export const routes = {
},
agencies: {
packages:
() => import('agencies/packages'),
provinces:
() => import('agencies/provinces')
() => import('agencies/packages')
},
cms: {
about:

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "hedera-web",
"version": "24.8.0",
"version": "24.8.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "hedera-web",
"version": "24.8.0",
"version": "24.8.1",
"license": "GPL-3.0",
"dependencies": {
"js-yaml": "^3.12.1",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "24.8.0",
"version": "24.8.2",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {

2
rest/edi/lib/segment.php
View File

@ -18,7 +18,7 @@ class Segment {
switch ($type) {
case Type::DATE:
$tmp = Date.vnNew();
$tmp = new Date();
$tmp->setDate(substr($v, 0, 4), substr($v, 4, 2), substr($v, 6, 2));
return $tmp;
case Type::TIME: