Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
1ccbd14
Merge pull request #1 from CE-PhoenixCart/master
Vitexus Apr 7, 2021
680c5f7
Basic translations
Vitexus Apr 7, 2021
a4b9245
error hunt
Borbina Apr 8, 2021
516eaf8
Merge pull request #2 from Borbina/CSOBPayGW
Vitexus Apr 8, 2021
a64388a
Czech Localization fix for create account.
Vitexus Apr 17, 2021
bcc63ef
Initial aplha of CSOB payment
Vitexus Apr 21, 2021
d67b474
Merge pull request #3 from Vitexus/PURE_CSOB_0.3a
Vitexus Apr 21, 2021
e76dd6a
Merge branch 'master' of https://github.com/CE-PhoenixCart/PhoenixCar…
Vitexus May 10, 2021
b650730
Merge branch 'CE-PhoenixCart-master'
Vitexus May 10, 2021
392dd00
Merge branch 'master' of github.com:Vitexus/PhoenixCart
Vitexus May 10, 2021
a068270
Merge pull request #1 from Vitexus/master
SimonFormanek May 10, 2021
b95e0b9
CSOB Iprovements
Vitexus May 29, 2021
0fb06ef
MODULE_PAYMENT_CSOB_ERROR_TITLE + MODULE_PAYMENT_CSOB_ERROR_GENERAL e…
Vitexus May 29, 2021
73f7c7c
Merge pull request #2 from Vitexus/master
SimonFormanek May 29, 2021
085d41d
GW Currency rate fixed
Vitexus May 30, 2021
0e1d5d4
Create CSOB payment states as public to be shown to customer
Vitexus May 30, 2021
05707c9
basic css template system
SimonFormanek May 30, 2021
b22c65e
Merge branch 'master' of https://github.com/Vitexus/PhoenixCart
SimonFormanek May 30, 2021
f14f1b7
Merge branch 'master' into css
SimonFormanek May 30, 2021
a13ee3f
Debian package files
Vitexus May 30, 2021
2662b3c
Expired card payment handling
Vitexus May 30, 2021
b4ff6a6
Merge pull request #3 from Vitexus/master
SimonFormanek May 30, 2021
ff975cb
Merge pull request #6 from PureHTML/master
Vitexus May 31, 2021
c91ca84
Merge branch 'master' of https://github.com/Vitexus/PhoenixCart
SimonFormanek May 31, 2021
8f6eaad
Merge branch 'master' into css
SimonFormanek May 31, 2021
69e312d
zasilkovna-balikovna module NOT working 0.1 version doc: admin/doc/za…
SimonFormanek May 31, 2021
3450f00
Merge pull request #8 from SimonFormanek/balikzasilk
Vitexus May 31, 2021
6005945
Merge pull request #9 from SimonFormanek/master
Vitexus May 31, 2021
b10ab86
Maintainance seeds
Vitexus May 31, 2021
5805176
Merge pull request #4 from Vitexus/master
SimonFormanek May 31, 2021
9a8ddc8
CSOB Package introduced
Vitexus Jun 1, 2021
abf15ea
post install: configure.php removed & added to .gitignore
Jun 1, 2021
3b02827
populate shop by demodata with default czech language
Vitexus Jun 2, 2021
1ca1ac5
install also Makefile
Vitexus Jun 2, 2021
2cd979d
Balikovna + Payment fixed
Vitexus Jun 2, 2021
89f52d3
Perform payment check everytime
Vitexus Jun 2, 2021
1c177e8
Csob + Balikovna + Zasilkovna fixes
Vitexus Jun 2, 2021
0909f69
Cancelled payment processing
Vitexus Jun 2, 2021
fa32c02
set czk as default currency
Vitexus Jun 2, 2021
7b7352c
Create dependabot.yml
Vitexus Jun 3, 2021
53141a6
Shipping modules fixing
Vitexus Jun 3, 2021
1615a1b
Upstream applyed
Vitexus Jun 3, 2021
10d94a8
Merge branch 'master' of github.com:Vitexus/PhoenixCart
Vitexus Jun 3, 2021
ae7bb5c
configRemovedFromGIT
SimonFormanek Jun 7, 2021
f164bee
config_key_new_db_charset
SimonFormanek Jun 7, 2021
9d3db62
Merge branch 'master' of github.com:simonFormanek/phoenixcart into HEAD
SimonFormanek Jun 7, 2021
aad58f4
Merge branch 'master' of git://github.com/SimonFormanek/PhoenixCart i…
Vitexus Jun 7, 2021
c6a0d46
Merge branch 'SimonFormanek-master'
Vitexus Jun 7, 2021
f2bfec6
Debian Bookworm build added
Vitexus Sep 3, 2021
b86a32b
Bump chillerlan/php-qrcode from 4.3.0 to 4.3.4
dependabot[bot] Jul 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "composer" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/debian/phoenix-cart-installer.debhelper.log
/debian/phoenix-cart-installer.substvars
/debian/phoenix-cart.debhelper.log
/debian/debhelper-build-stamp
/debian/phoenix-cart.postrm.debhelper
/debian/phoenix-cart.substvars
/debian/.debhelper/
/debian/phoenix-cart/
/debian/phoenix-cart-installer/
/.github/
/debian/phoenix-cart-admin.debhelper.log
/debian/phoenix-cart-admin.substvars
/debian/phoenix-cart-admin/
/deb/

/vendor/
/ext/composer/
/nbproject/private/
/debian/phoenix-cart/
/debian/phoenix-cart-installer/
/debian/phoenix-cart-admin/
/debian/phoenix-cart-csob.debhelper.log
/debian/phoenix-cart-csob.substvars
/debian/phoenix-cart-csob/
/.vagrant/
/.vscode/

includes/configure.php
admin/includes/configure.php
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "includes/apps/gpwebpay/gp-webpay-php-sdk"]
path = includes/apps/gpwebpay/gp-webpay-php-sdk
url = git@github.com:PureHTML/gp-webpay-php-sdk.git
25 changes: 25 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM debian:latest

ENV APACHE_DOCUMENT_ROOT /usr/share/phoenix-cart/
ENV DEBIAN_FRONTEND=noninteractive

RUN apt update ; apt install -y wget libapache2-mod-php; echo "deb http://repo.vitexsoftware.cz buster main backports" | tee /etc/apt/sources.list.d/vitexsoftware.list ; wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg http://repo.vitexsoftware.cz/keyring.gpg
RUN apt-get update && apt-get install -y locales php-pdo-sqlite apache2 aptitude cron locales-all && rm -rf /var/lib/apt/lists/* \
&& localedef -i cs_CZ -c -f UTF-8 -A /usr/share/locale/locale.alias cs_CZ.UTF-8
ENV LANG cs_CZ.utf8

RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf

ADD deb/* /var/deb/

RUN echo "deb [trusted=yes] file:///var/deb ./" > /etc/apt/sources.list.d/local.list
RUN ls -la /var/deb ; apt update

RUN aptitude -y install mariadb-server

RUN aptitude -y install phoenix-cart-admin phoenix-cart-installer ; a2enconf phoenix-cart


CMD /usr/sbin/cron
CMD [ "/usr/sbin/apache2ctl", "-D", "FOREGROUND" ]
185 changes: 185 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
#!groovy

// Docker images generated by https://github.com/VitexSoftware/BuildImages


pipeline {
agent none

options {
ansiColor('xterm')
copyArtifactPermission('*');
//disableConcurrentBuilds()
}

environment {
RED = '\\e[31m'
GREEN = '\\e[32m'
ENDCOLOR = '\\e[0m'
}

stages {

stage('debian-buster') {
agent {
docker { image 'vitexsoftware/debian:oldstable' }
}
steps {
dir('build/debian/package') {
checkout scm
buildPackage()
installPackages()
}
stash includes: 'dist/**', name: 'dist-buster'
}
post {
success {
archiveArtifacts 'dist/debian/'
copyArtifact()
}
}
}

stage('debian-bullseye') {
agent {
docker { image 'vitexsoftware/debian:stable' }
}
steps {
dir('build/debian/package') {
checkout scm
buildPackage()
installPackages()
}
stash includes: 'dist/**', name: 'dist-bullseye'
}
post {
success {
archiveArtifacts 'dist/debian/'
copyArtifact()
}
}
}

stage('debian-bookworm') {
agent {
docker { image 'vitexsoftware/debian:testing' }
}
steps {
dir('build/debian/package') {
checkout scm
buildPackage()
installPackages()
}
stash includes: 'dist/**', name: 'dist-bookworm'
}
post {
success {
archiveArtifacts 'dist/debian/'
copyArtifact()
}
}
}

stage('ubuntu-focal') {
agent {
docker { image 'vitexsoftware/ubuntu:stable' }
}
steps {
dir('build/debian/package') {
checkout scm
buildPackage()
installPackages()
}
stash includes: 'dist/**', name: 'dist-focal'
}
post {
success {
archiveArtifacts 'dist/debian/'
copyArtifact()
}
}
}

stage('ubuntu-hirsute') {
agent {
docker { image 'vitexsoftware/ubuntu:testing' }
}
steps {
dir('build/debian/package') {
checkout scm
buildPackage()
installPackages()
}
stash includes: 'dist/**', name: 'dist-hirsute'
}
post {
success {
archiveArtifacts 'dist/debian/'
copyArtifact()
}
}
}

}
}

def copyArtifact(){
step ([$class: 'CopyArtifact',
projectName: '${JOB_NAME}',
filter: "**/*.deb",
target: '/var/tmp/deb',
flatten: true,
selector: specific('${BUILD_NUMBER}')
]);
}

def buildPackage() {

def DIST = sh (
script: 'lsb_release -sc',
returnStdout: true
).trim()

def DISTRO = sh (
script: 'lsb_release -sd',
returnStdout: true
).trim()


def SOURCE = sh (
script: 'dpkg-parsechangelog --show-field Source',
returnStdout: true
).trim()

def VERSION = sh (
script: 'dpkg-parsechangelog --show-field Version',
returnStdout: true
).trim()

ansiColor('vga') {
echo '\033[42m\033[90mBuild debian package ' + SOURCE + ' v' + VERSION + ' for ' + DISTRO + '\033[0m'
}

def VER = VERSION + '~' + DIST + '~' + env.BUILD_NUMBER

//Buster problem: Can't continue: dpkg-parsechangelog is not new enough(needs to be at least 1.17.0)
//
// debianPbuilder additionalBuildResults: '',
// components: '',
// distribution: DIST,
// keyring: '',
// mirrorSite: 'http://deb.debian.org/debian/',
// pristineTarName: ''
sh 'dch -b -v ' + VER + ' "' + env.BUILD_TAG + '"'
sh 'sudo apt-get update'
sh 'debuild-pbuilder -i -us -uc -b'
sh 'mkdir -p $WORKSPACE/dist/debian/ ; rm -rf $WORKSPACE/dist/debian/* ; for deb in $(cat debian/files | awk \'{print $1}\'); do mv "../$deb" $WORKSPACE/dist/debian/; done'
}

def installPackages() {
sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd $WORKSPACE'
sh 'echo "deb [trusted=yes] file:///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
sh 'sudo apt-get update'
sh 'echo "${GREEN} INSTALATION ${ENDCOLOR}"'
sh 'IFS="\n\b"; for package in `ls $WORKSPACE/dist/debian/ | grep .deb | awk -F_ \'{print \$1}\'` ; do echo -e "${GREEN} installing ${package} on `lsb_release -sc` ${ENDCOLOR} " ; sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=developer apt-get -y install $package ; done;'
}
81 changes: 81 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
repoversion=$(shell LANG=C aptitude show ce-phoenix | grep Version: | awk '{print $$2}')
nextversion=$(shell echo $(repoversion) | perl -ne 'chomp; print join(".", splice(@{[split/\./,$$_]}, 0, -1), map {++$$_} pop @{[split/\./,$$_]}), "\n";')

clean:
rm -rf vendor composer.lock db/*.sqlite src/*/*dataTables*

migration:
./vendor/bin/phinx migrate -c ./phinx-adapter.php

autoload:
composer update

demodata:
./vendor/bin/phinx seed:run -s Phoenix -s Demodata -s Cz -c ./phinx-adapter.php
./vendor/bin/phinx migrate -c ./phinx-adapter.php

adminreset:
./vendor/bin/phinx seed:run -s ResetAdmin -c ./phinx-adapter.php

newmigration:
read -p "Enter CamelCase migration name : " migname ; ./vendor/bin/phinx create $$migname -c ./phinx-adapter.php

newseed:
read -p "Enter CamelCase seed name : " migname ; ./vendor/bin/phinx seed:create $$migname -c ./phinx-adapter.php

dbreset:
sudo rm -f db/multiflexibee.sqlite
echo > db/multiflexibee.sqlite
chmod 666 db/multiflexibee.sqlite
chmod ugo+rwX db

demo: dbreset migration demodata

hourly:
cd lib; php -f executor.php h
daily:
cd lib; php -f executor.php d
monthly:
cd lib; php -f executor.php m

postinst:
DEBCONF_DEBUG=developer /usr/share/debconf/frontend /var/lib/dpkg/info/ce-phoenix.postinst configure $(nextversion)

redeb:
sudo apt -y purge ce-phoenix; rm ../ce-phoenix_*_all.deb ; debuild -us -uc ; sudo gdebi -n ../ce-phoenix_*_all.deb ; sudo apache2ctl restart

deb:
debuild-pbuilder


dimage: deb
docker container stop $(docker container ls -q --filter name=ce-phoenix*)
rm -f deb/* ; mv ../ce-phoenix*.deb deb
cd deb ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz ; cd ..
docker build -t purehtml/ce-phoenix .

drun:
docker run -dit --name ce-phoenix -p 8080:80 purehtml/ce-phoenix
firefox http://localhost:8080/ce-phoenix?login=demo\&password=demo


vagrant: deb
vagrant destroy -f
mkdir -p deb
debuild -us -uc
mv ../phoenix-cart*$(currentversion)_all.deb deb
cd deb ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd ..
vagrant up
firefox http://localhost:8080/ce-phoenix?login=demo\&password=demo

release:
echo Release v$(nextversion)
docker build -t purehtml/ce-phoenix:$(nextversion) .
dch -v $(nextversion) `git log -1 --pretty=%B | head -n 1`
debuild -i -us -uc -b
git commit -a -m "Release v$(nextversion)"
git tag -a $(nextversion) -m "version $(nextversion)"
docker push purehtml/ce-phoenix:$(nextversion)
docker push purehtml/ce-phoenix:latest


52 changes: 52 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
config.vm.box = "debian/buster64"
config.vm.network "forwarded_port", guest: 80, host: 8080
config.vm.provision "shell", inline: <<-SHELL

export APACHE_DOCUMENT_ROOT=/usr/share/phoenix-cart/
export DEBIAN_FRONTEND=noninteractive

apt install lsb-release wget
echo "deb https://repo.vitexsoftware.cz $(lsb_release -sc) main backports" | tee /etc/apt/sources.list.d/vitexsoftware.list
wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg https://repo.vitexsoftware.cz/keyring.gpg
echo "deb [trusted=yes] file:///vagrant/deb ./" > /etc/apt/sources.list.d/local.list
apt-get update
apt-get install -y apache2 libapache2-mod-php


#apt -y install phoenix-cart-sqlite

apt -y install mariadb-server
systemctl start mysql
apt -y install phoenix-cart-mysql

a2enconf phoenix-cart

echo ServerName MultiAbraFlexi >> /etc/apache2/apache2.conf
#sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
#sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf

export DEBCONF_DEBUG=developer

#apt -y install abraflexi-matcher abraflexi-reminder abraflexi-contract-invoices abraflexi-digest

apt -y install php-tools php-xdebug
echo "xdebug.force_display_errors = 1" >> /etc/php/*/cli/conf.d/20-xdebug.ini
echo "xdebug.mode=develop" >> /etc/php/*/cli/conf.d/20-xdebug.ini

php-devconf
phpenmod xdebug

echo '<a href="phoenix-cart?login=demo&password=demo">Multi AbraFlexi Setup</a><?php phpinfo();' > /var/www/html/index.php
rm -rf /var/www/html/index.html

apache2ctl restart

apt-get -y install links
links -dump http://localhost/phoenix-cart

SHELL
end
Loading