Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 pvincent
|
bc939a5bdb | ||
|
pvincent
|
4a052ea707 | ||
|
pvincent
|
f139fcfefb | ||
|
pvincent
|
347a81dc66 | ||
|
pvincent
|
d142fc1eac | ||
|
pvincent
|
e039ed4fe5 | ||
|
pvincent
|
44d2248ba5 | ||
|
pvincent
|
34e7527442 | ||
|
pvincent
|
ecffe9bb4e | ||
|
pvincent
|
6e7382633f | ||
|
pvincent
|
bb50c92230 | ||
|
pvincent
|
98dffaebed | ||
|
pvincent
|
ca6aceffbc | ||
|
pvincent
|
c4ea83cca9 | ||
|
pvincent
|
6c4aa6d9ea | ||
|
pvincent
|
cdfe52715f | ||
|
pvincent
|
8bd119a818 | ||
|
pvincent
|
0854d556fe |
+1
-1
@@ -1 +1 @@
|
||||
1.10.2
|
||||
1.11.4
|
||||
|
||||
@@ -7,9 +7,9 @@ ENV?="dev"
|
||||
|
||||
install:
|
||||
#copy config file from template first time only
|
||||
@if [ ! -f config.xml ]; then \
|
||||
cp config.xml.dist config.xml; \
|
||||
fi
|
||||
# @if [ ! -f config.xml ]; then \
|
||||
# cp config.xml.dist config.xml; \
|
||||
# fi
|
||||
|
||||
@if [ $(ENV) = "dev" ]; then \
|
||||
make install_dev; \
|
||||
|
||||
@@ -1,69 +1,82 @@
|
||||
CAGETTE PEI
|
||||
===========
|
||||
|
||||
Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
|
||||
Cagette Péi est un logiciel libre qui favorise les circuits courts.
|
||||
Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.
|
||||
|
||||
Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement,
|
||||
j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
|
||||
> <french>
|
||||
> Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018. Certaines portions de code n'étant plus disponibles en téléchargement à partir de cette date, le logiciel a été repris, adapté puis réactualisé. Pour plus d'information, contact@artcode.re
|
||||
> </french>
|
||||
|
||||
## INSTALL FROM SCRATCH (debian-buster)
|
||||
|
||||
|
||||
* apt install -y curl
|
||||
* curl -L https://deb.nodesource.com/setup_8.x | bash -
|
||||
* apt install -y nodejs=8.17.0-1nodesource1
|
||||
* apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server
|
||||
* mysql -u root <<EOF
|
||||
## PREREQUISITE MARIADB
|
||||
|
||||
```bash
|
||||
apt install -y mariadb-server
|
||||
mysql -u root <<EOF
|
||||
CREATE DATABASE cagettepei;
|
||||
GRANT ALL ON cagettepei.* TO 'cagettepei'@'%' IDENTIFIED BY 'cagettepei';
|
||||
EOF
|
||||
* cd /var/www
|
||||
* git clone https://git.artcode.re/cagetters/cagettepei.git
|
||||
* cd cagettepei
|
||||
* make install ENV=dev # first time
|
||||
* make compile # classes
|
||||
* make templates # templates + i18n
|
||||
* vim /etc/apache2/sites-available/cagettepei.conf
|
||||
```
|
||||
|
||||
## INSTALL FROM SCRATCH
|
||||
|
||||
Rk: Works on any Debian (>=Buster) compatible server!
|
||||
|
||||
```
|
||||
apt install -y curl
|
||||
curl -L https://deb.nodesource.com/setup_8.x | bash -
|
||||
apt install -y nodejs=8.17.0-1nodesource1
|
||||
apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server sendemail libio-socket-ssl-perl libnet-ssleay-perl
|
||||
|
||||
cd /var/www
|
||||
git clone https://git.artcode.re/cagetters/cagettepei.git
|
||||
cd cagettepei
|
||||
make install ENV=dev
|
||||
|
||||
vim /etc/apache2/sites-available/cagettepei.conf
|
||||
```
|
||||
|
||||
|
||||
```
|
||||
<VirtualHost *:80>
|
||||
ServerName cagettepei
|
||||
DirectoryIndex index.n
|
||||
DocumentRoot /var/www/cagettepei/www/
|
||||
|
||||
|
||||
DocumentRoot /var/www/cagettepei/www
|
||||
DirectoryIndex index.n
|
||||
CustomLog ${APACHE_LOG_DIR}/cagettepei/access.log combined
|
||||
</VirtualHost>
|
||||
```
|
||||
* sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
|
||||
* a2dissite 000-default.conf
|
||||
* a2ensite cagettepei.conf
|
||||
* a2enmod neko rewrite
|
||||
* systemctl restart apache2
|
||||
|
||||
|
||||
```bash
|
||||
sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
|
||||
a2dissite 000-default.conf
|
||||
a2ensite cagettepei.conf
|
||||
a2enmod rewrite
|
||||
mkdir -p /var/log/apache2/cagettepei
|
||||
systemctl restart apache2
|
||||
```
|
||||
|
||||
## CONFIGURATION
|
||||
|
||||
* cd /var/www/cagettepei
|
||||
* vim config.xml
|
||||
```bash
|
||||
cd /var/www/cagettepei
|
||||
vim config.xml
|
||||
```
|
||||
```
|
||||
<config
|
||||
host="<DOMAIN.TLD>"
|
||||
key="<SECRET_PHRASE>"
|
||||
name = "CagettePéi"
|
||||
host = "<DOMAIN.TLD>"
|
||||
database = "mysql://cagettepei:cagettepei@localhost/cagettepei"
|
||||
key = "<SECRET_PHRASE>"
|
||||
default_email = "<EMAIL>"
|
||||
webmaster_email = "<EMAIL>"
|
||||
database="mysql://cagettepei:cagettepei@localhost/cagettepei"
|
||||
|
||||
smtp_host="localhost"
|
||||
smtp_port="25"
|
||||
smtp_user=""
|
||||
smtp_pass=""
|
||||
debug = "0"
|
||||
sqllog = "0"
|
||||
maintain = "0"
|
||||
|
||||
lang="fr"
|
||||
langs="fr"
|
||||
langnames="Français"
|
||||
maintain="0"
|
||||
debug="0"
|
||||
sqllog="0"
|
||||
cache="1"
|
||||
cachetpl="0"
|
||||
cache = "1"
|
||||
cachetpl = "0"
|
||||
/>
|
||||
```
|
||||
|
||||
@@ -72,16 +85,19 @@ ADMIN RESET PASSWORD
|
||||
|
||||
go to http://localhost for ERROR + table regeneration, then
|
||||
|
||||
* cd /var/www/cagettepei
|
||||
* SECRET=$(grep key= config.xml | cut -d= -f2 | cut -d'"' -f2)
|
||||
* echo "insert into User values (1,'fr',MD5('${SECRET}cagettepei'),1,'Administrateur','Cagette Péi', 'admin', null, null, null, null, null, null, null, null, null, now(), now(),6,null, null)" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
|
||||
```
|
||||
cd /var/www/cagettepei
|
||||
SECRET=$(grep key config.xml | cut -d= -f2 | cut -d'"' -f2)
|
||||
echo "insert into User values (1,'fr',MD5('${SECRET}cagettepei'),1,'Administrateur','Cagette Péi', 'admin', null, null, null, null, null, null, null, null, null, now(), now(),6,null, null)" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
|
||||
```
|
||||
|
||||
then, connect with admin / cagettepei
|
||||
|
||||
### change admin password
|
||||
|
||||
* echo "update User set pass=MD5('${SECRET}cagettepei') where id=1" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
|
||||
|
||||
```
|
||||
echo "update User set pass=MD5('${SECRET}cagettepei') where id=1" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
|
||||
```
|
||||
|
||||
SYSTEMD-TIMERS
|
||||
--------------
|
||||
@@ -98,7 +114,7 @@ SYSTEMD-TIMERS
|
||||
|
||||
SELECTOR=$1
|
||||
|
||||
for i in /var/www/cagettepei-* ; do
|
||||
for i in /var/www/cagettepei* ; do
|
||||
if [[ -d $i ]]; then
|
||||
cd $i/www
|
||||
echo "cron-$SELECTOR in: $i"
|
||||
|
||||
+3
-8
@@ -1,19 +1,14 @@
|
||||
<config
|
||||
|
||||
database = "mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
|
||||
host = "<URL without http>"
|
||||
name = "<HTML head title>"
|
||||
default_email = "<EMAIL>"
|
||||
webmaster_email = "<EMAIL>"
|
||||
key = "<SECRET_PHRASE>"
|
||||
|
||||
maintain="0"
|
||||
cache="1"
|
||||
cachetpl="0"
|
||||
debug="0"
|
||||
sqllog="0"
|
||||
maintain="0"
|
||||
|
||||
lang="fr"
|
||||
langs="fr"
|
||||
langnames="Français"
|
||||
cache="1"
|
||||
cachetpl="0"
|
||||
/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
::use 'admin/design.mtt'::
|
||||
|
||||
|
||||
<h3>Console d'administration de Cagette.net</h3>
|
||||
<h3>Console d'administration de CagettePéi</h3>
|
||||
<p>
|
||||
::hDate(now)::
|
||||
</p>
|
||||
|
||||
+9
-100
@@ -13,11 +13,7 @@
|
||||
::if groupName!=null && noGroup!=true::
|
||||
<h1>::groupName::</h1>
|
||||
::else::
|
||||
<div style="margin-bottom:22px;" >
|
||||
<a href="https://git.artcode.re/cagetters/cagettepei" target="_blank">
|
||||
<img src="/img/logo3.png" alt="::NAME::" />
|
||||
</a>
|
||||
</div>
|
||||
<h1>::_("Cagette.net")::</h1>
|
||||
::end::
|
||||
</div>
|
||||
|
||||
@@ -129,10 +125,13 @@
|
||||
|
||||
<div class="row" id="footer">
|
||||
|
||||
<div class="col-md-9" >
|
||||
<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
|
||||
<img src="/img/logo.png" alt="::_("Cagette.net")::"/>
|
||||
</a>
|
||||
<div class="col-md-2" >
|
||||
<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
|
||||
</div>
|
||||
|
||||
<div class="col-md-7" style="padding-top:1em">
|
||||
Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
|
||||
Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3" >
|
||||
@@ -149,57 +148,12 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!--<p style="position: absolute;display: block;top: 96px;width: 700px;">
|
||||
<b>::raw _("Vous êtes producteur ?")::</b>
|
||||
::raw _("Découvrez nos formations gratuites pour utiliser <b>Cagette Pro</b> ")::
|
||||
<a href="http://alilo.fr/formations-producteurs" target="_blank" class="btn btn-xs btn-info">C'est parti !</a>
|
||||
</p>-->
|
||||
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div class="col-md-3" >
|
||||
::_("FOLLOW US")::
|
||||
<ul class="cagsocialmedia">
|
||||
<li class="cagfb">
|
||||
<a title="Facebook" href="https://www.facebook.com/cagette" target="_blank"> <i class="fa fa-facebook"></i></a>
|
||||
</li>
|
||||
<li class="cagtwitter">
|
||||
<a title="Twitter" href="https://twitter.com/Cagettenet" target="_blank"> <i class="fa fa-twitter"></i></a>
|
||||
</li>
|
||||
<li class="cagyoutube">
|
||||
<a title="Youtube" href="https://www.youtube.com/channel/UC3cvGxAUrbN9oSZmr1oZEaw" target="_blank"> <i class="fa fa-youtube"></i></a>
|
||||
</li>
|
||||
<li style="background-color:#333;">
|
||||
<a title="Github" href="https://github.com/bablukid/cagette" target="_blank"> <i class="fa fa-github"></i></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<div class="col-md-3">
|
||||
::_("CONTACT US")::
|
||||
<ul>
|
||||
<li>
|
||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
|
||||
<input type="hidden" name="cmd" value="_s-xclick"/>
|
||||
<input type="hidden" name="hosted_button_id" value="S9KT7FQS7P622"/>
|
||||
<input type="image" src="https://www.paypalobjects.com/fr_FR/FR/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal, le réflexe sécurité pour payer en ligne"/>
|
||||
<img alt="" border="0" src="https://www.paypalobjects.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/>
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
-->
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row" id="subfooter">
|
||||
<!--
|
||||
::raw _("Cagette.net is made by <a href='https://www.alilo.fr' target='_blank'><img src='/img/alilo-trans-black.png' /></a>")::<br/>
|
||||
-->
|
||||
<span>version cagettepei-<a href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
|
||||
<span>version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
@@ -219,49 +173,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
::if (false && user!=null && user.isAmapManager())::
|
||||
<script>
|
||||
// Include the UserVoice JavaScript SDK (only needed once on a page)
|
||||
UserVoice=window.UserVoice||[];(function(){var uv=document.createElement('script');uv.type='text/javascript';uv.async=true;uv.src='//widget.uservoice.com/sayZ1eIZLfSZUa3IwslHCw.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(uv,s)})();
|
||||
|
||||
//
|
||||
// UserVoice Javascript SDK developer documentation:
|
||||
// https://www.uservoice.com/o/javascript-sdk
|
||||
//
|
||||
|
||||
// Set colors
|
||||
UserVoice.push(['set', {
|
||||
accent_color: '#6aba2e',
|
||||
trigger_color: 'white',
|
||||
trigger_background_color: '#e2753a'
|
||||
}]);
|
||||
|
||||
// Identify the user and pass traits
|
||||
// To enable, replace sample data with actual user traits and uncomment the line
|
||||
UserVoice.push(['identify', {
|
||||
//email: 'john.doe@example.com', // User’s email address
|
||||
//name: 'John Doe', // User’s real name
|
||||
//created_at: 1364406966, // Unix timestamp for the date the user signed up
|
||||
//id: 123, // Optional: Unique id of the user (if set, this should not change)
|
||||
//type: 'Owner', // Optional: segment your users by type
|
||||
//account: {
|
||||
// id: 123, // Optional: associate multiple users with a single account
|
||||
// name: 'Acme, Co.', // Account name
|
||||
// created_at: 1364406966, // Unix timestamp for the date the account was created
|
||||
// monthly_rate: 9.99, // Decimal; monthly rate of the account
|
||||
// ltv: 1495.00, // Decimal; lifetime value of the account
|
||||
// plan: 'Enhanced' // Plan name for the account
|
||||
//}
|
||||
}]);
|
||||
|
||||
// Add default trigger to the bottom-right corner of the window:
|
||||
UserVoice.push(['addTrigger', { mode: 'smartvote', trigger_position: 'bottom-right' }]);
|
||||
|
||||
// Or, use your own custom trigger:
|
||||
//UserVoice.push(['addTrigger', '#id', { mode: 'smartvote' }]);
|
||||
|
||||
// Autoprompt for Satisfaction and SmartVote (only displayed under certain conditions)
|
||||
UserVoice.push(['autoprompt', {}]);
|
||||
</script>
|
||||
::end::
|
||||
::end::
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
::use 'design.mtt'::
|
||||
<!--::use 'design.mtt'::-->
|
||||
<div class="text-center" style="height:400px;width:100%;">
|
||||
<h1>
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
@@ -14,4 +14,4 @@
|
||||
|
||||
</div>
|
||||
|
||||
::end::
|
||||
<!--::end::-->
|
||||
|
||||
+1
-1
@@ -47,5 +47,5 @@
|
||||
"bugs": {
|
||||
"url": "https://github.com/bablukid/cagette/issues"
|
||||
},
|
||||
"version": "1.10.2"
|
||||
"version": "1.11.3"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import db.User;
|
||||
import thx.semver.Version;
|
||||
import Common;
|
||||
|
||||
class App extends sugoi.BaseApp {
|
||||
@@ -10,13 +9,6 @@ class App extends sugoi.BaseApp {
|
||||
public var eventDispatcher:hxevents.Dispatcher<Event>;
|
||||
public var plugins:Array<sugoi.plugin.IPlugIn>;
|
||||
|
||||
/**
|
||||
* Version management
|
||||
* @doc https://github.com/fponticelli/thx.semver
|
||||
*/
|
||||
// public static var VERSION = ([0,9,2] : Version).withPre("july");
|
||||
// public static var VERSION = ([0,9,2] : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
|
||||
// public static var VERSION = "cagette-péi " + MyMacros.getGitCommitDate();
|
||||
public static var VERSION = "cagette-pei"; // empty yet, cf.BaseApp.loadConfig
|
||||
|
||||
public function new() {
|
||||
|
||||
+186
-194
@@ -1,4 +1,5 @@
|
||||
package controller;
|
||||
|
||||
import db.UserContract;
|
||||
import sugoi.form.elements.DateDropdowns;
|
||||
import sugoi.form.elements.Input;
|
||||
@@ -7,14 +8,13 @@ import sugoi.form.Form;
|
||||
import db.Contract;
|
||||
import Common;
|
||||
import plugin.Tutorial;
|
||||
|
||||
using Std;
|
||||
|
||||
import service.OrderService;
|
||||
|
||||
class Contract extends Controller
|
||||
{
|
||||
|
||||
public function new()
|
||||
{
|
||||
class Contract extends Controller {
|
||||
public function new() {
|
||||
super();
|
||||
}
|
||||
|
||||
@@ -29,58 +29,58 @@ class Contract extends Controller
|
||||
*/
|
||||
@tpl("contract/default.mtt")
|
||||
function doDefault() {
|
||||
|
||||
//Create the list of links to change the language
|
||||
var langs = App.config.get("langs").split(";");
|
||||
var langNames = App.config.get("langnames").split(";");
|
||||
var i=0;
|
||||
// Create the list of links to change the language
|
||||
var langs = App.config.get("langs", "fr").split(";");
|
||||
var langNames = App.config.get("langnames", "Français").split(";");
|
||||
var i = 0;
|
||||
var langLinks = "";
|
||||
for (lang in langs)
|
||||
{
|
||||
for (lang in langs) {
|
||||
langLinks += "<li><a href=\"?lang=" + langs[i] + "\">" + langNames[i] + "</a></li>";
|
||||
i++;
|
||||
}
|
||||
view.langLinks = langLinks;
|
||||
view.langText = langNames[langs.indexOf(app.session.lang)];
|
||||
|
||||
//change account lang
|
||||
if (app.params.exists("lang") && app.user!=null){
|
||||
// change account lang
|
||||
if (app.params.exists("lang") && app.user != null) {
|
||||
app.user.lock();
|
||||
app.user.lang = app.params.get("lang");
|
||||
app.user.update();
|
||||
}
|
||||
|
||||
var ua = db.UserAmap.get(app.user, app.user.amap);
|
||||
if (ua == null) throw Error("/", t._("You are not a member of this group"));
|
||||
if (ua == null)
|
||||
throw Error("/", t._("You are not a member of this group"));
|
||||
|
||||
var constOrders = null;
|
||||
var varOrders = new Map<String,Array<db.UserContract>>();
|
||||
var varOrders = new Map<String, Array<db.UserContract>>();
|
||||
|
||||
var a = App.current.user.amap;
|
||||
var oneMonthAgo = DateTools.delta(Date.now(), -1000.0 * 60 * 60 * 24 * 30);
|
||||
|
||||
//constant orders
|
||||
// constant orders
|
||||
var contracts = db.Contract.manager.search($type == db.Contract.TYPE_CONSTORDERS && $amap == a && $endDate > oneMonthAgo, false);
|
||||
constOrders = [];
|
||||
for ( c in contracts){
|
||||
for (c in contracts) {
|
||||
var orders = app.user.getOrdersFromContracts([c]);
|
||||
if (orders.length == 0) continue;
|
||||
constOrders.push({contract:c, orders:service.OrderService.prepare(orders) });
|
||||
if (orders.length == 0)
|
||||
continue;
|
||||
constOrders.push({contract: c, orders: service.OrderService.prepare(orders)});
|
||||
}
|
||||
|
||||
//variable orders, grouped by date
|
||||
// variable orders, grouped by date
|
||||
var contracts = db.Contract.manager.search($type == db.Contract.TYPE_VARORDER && $amap == a && $endDate > oneMonthAgo, false);
|
||||
|
||||
for (c in contracts) {
|
||||
var ds = c.getDistribs(false);
|
||||
for (d in ds) {
|
||||
//store orders in a stringmap like "2015-01-01" => [order1,order2,...]
|
||||
// store orders in a stringmap like "2015-01-01" => [order1,order2,...]
|
||||
var k = d.date.toString().substr(0, 10);
|
||||
var orders = app.user.getOrdersFromDistrib(d);
|
||||
if (orders.length > 0) {
|
||||
if (!varOrders.exists(k)) {
|
||||
varOrders.set(k, Lambda.array(orders));
|
||||
}else {
|
||||
} else {
|
||||
var z = varOrders.get(k).concat(Lambda.array(orders));
|
||||
varOrders.set(k, z);
|
||||
}
|
||||
@@ -88,58 +88,53 @@ class Contract extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
//final structure
|
||||
var varOrders2 = new Array<{date:Date,orders:Array<UserOrder>}>();
|
||||
for ( k in varOrders.keys()) {
|
||||
|
||||
// final structure
|
||||
var varOrders2 = new Array<{date:Date, orders:Array<UserOrder>}>();
|
||||
for (k in varOrders.keys()) {
|
||||
var d = new Date(k.split("-")[0].parseInt(), k.split("-")[1].parseInt() - 1, k.split("-")[2].parseInt(), 0, 0, 0);
|
||||
var orders = service.OrderService.prepare( Lambda.list(varOrders[k]) );
|
||||
var orders = service.OrderService.prepare(Lambda.list(varOrders[k]));
|
||||
|
||||
varOrders2.push({date:d,orders:orders});
|
||||
varOrders2.push({date: d, orders: orders});
|
||||
}
|
||||
|
||||
//sort by date desc
|
||||
// sort by date desc
|
||||
varOrders2.sort(function(b, a) {
|
||||
return Math.round(a.date.getTime()/1000)-Math.round(b.date.getTime()/1000);
|
||||
return Math.round(a.date.getTime() / 1000) - Math.round(b.date.getTime() / 1000);
|
||||
});
|
||||
|
||||
view.varOrders = varOrders2;
|
||||
view.constOrders = constOrders;
|
||||
|
||||
|
||||
// tutorials
|
||||
if (app.user.isAmapManager()) {
|
||||
|
||||
|
||||
//actions
|
||||
if (app.params.exists('startTuto') ) {
|
||||
|
||||
//start a tuto
|
||||
// actions
|
||||
if (app.params.exists('startTuto')) {
|
||||
// start a tuto
|
||||
app.user.lock();
|
||||
var t = app.params.get('startTuto');
|
||||
app.user.tutoState = {name:t,step:0};
|
||||
app.user.tutoState = {name: t, step: 0};
|
||||
app.user.update();
|
||||
}
|
||||
|
||||
// tuto state
|
||||
var tutos = new Array<{name:String, completion:Float, key:String}>();
|
||||
|
||||
//tuto state
|
||||
var tutos = new Array<{name:String,completion:Float,key:String}>();
|
||||
|
||||
for ( k in Tutorial.all().keys() ) {
|
||||
for (k in Tutorial.all().keys()) {
|
||||
var t = Tutorial.all().get(k);
|
||||
|
||||
var completion = null;
|
||||
if (app.user.tutoState!=null && app.user.tutoState.name == k) completion = app.user.tutoState.step / t.steps.length;
|
||||
if (app.user.tutoState != null && app.user.tutoState.name == k)
|
||||
completion = app.user.tutoState.step / t.steps.length;
|
||||
|
||||
tutos.push( { name:t.name, completion:completion , key:k } );
|
||||
tutos.push({name: t.name, completion: completion, key: k});
|
||||
}
|
||||
|
||||
view.tutos = tutos;
|
||||
}
|
||||
|
||||
//should be able to stop tuto in any case
|
||||
// should be able to stop tuto in any case
|
||||
if (app.params.exists('stopTuto')) {
|
||||
//stopped tuto from a tuto window
|
||||
// stopped tuto from a tuto window
|
||||
app.user.lock();
|
||||
app.user.tutoState = null;
|
||||
app.user.update();
|
||||
@@ -155,28 +150,29 @@ class Contract extends Controller
|
||||
*/
|
||||
@tpl("form.mtt")
|
||||
function doEdit(c:db.Contract) {
|
||||
|
||||
view.category = 'contractadmin';
|
||||
if (!app.user.isContractManager(c)) throw Error('/', t._("Forbidden action"));
|
||||
if (!app.user.isContractManager(c))
|
||||
throw Error('/', t._("Forbidden action"));
|
||||
|
||||
view.title = t._("Edit contract ::contractName::",{contractName:c.name});
|
||||
view.title = t._("Edit contract ::contractName::", {contractName: c.name});
|
||||
|
||||
var group = c.amap;
|
||||
var currentContact = c.contact;
|
||||
|
||||
var form = Form.fromSpod(c);
|
||||
form.removeElement( form.getElement("amapId") );
|
||||
form.removeElement(form.getElement("amapId"));
|
||||
form.removeElement(form.getElement("type"));
|
||||
form.getElement("userId").required = true;
|
||||
|
||||
app.event(EditContract(c,form));
|
||||
app.event(EditContract(c, form));
|
||||
|
||||
if (form.checkToken()) {
|
||||
form.toSpod(c);
|
||||
c.amap = group;
|
||||
|
||||
//checks & warnings
|
||||
if (c.hasPercentageOnOrders() && c.percentageValue==null) throw Error("/contract/edit/"+c.id, t._("If you would like to add fees to the order, define a rate (%) and a label."));
|
||||
// checks & warnings
|
||||
if (c.hasPercentageOnOrders() && c.percentageValue == null)
|
||||
throw Error("/contract/edit/" + c.id, t._("If you would like to add fees to the order, define a rate (%) and a label."));
|
||||
|
||||
if (c.hasStockManagement()) {
|
||||
for (p in c.getProducts()) {
|
||||
@@ -187,24 +183,23 @@ class Contract extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
//no stock mgmt for constant orders
|
||||
if (c.hasStockManagement() && c.type==db.Contract.TYPE_CONSTORDERS) {
|
||||
// no stock mgmt for constant orders
|
||||
if (c.hasStockManagement() && c.type == db.Contract.TYPE_CONSTORDERS) {
|
||||
c.flags.unset(ContractFlags.StockManagement);
|
||||
app.session.addMessage(t._("Managing stock is not available for CSA contracts"), true);
|
||||
}
|
||||
|
||||
|
||||
c.update();
|
||||
|
||||
//update rights
|
||||
if ( c.contact != null && (currentContact==null || c.contact.id!=currentContact.id) ) {
|
||||
// update rights
|
||||
if (c.contact != null && (currentContact == null || c.contact.id != currentContact.id)) {
|
||||
var ua = db.UserAmap.get(c.contact, app.user.amap, true);
|
||||
ua.giveRight(ContractAdmin(c.id));
|
||||
ua.giveRight(Messages);
|
||||
ua.giveRight(Membership);
|
||||
ua.update();
|
||||
|
||||
//remove rights to old contact
|
||||
// remove rights to old contact
|
||||
if (currentContact != null) {
|
||||
var x = db.UserAmap.get(currentContact, c.amap, true);
|
||||
if (x != null) {
|
||||
@@ -212,10 +207,9 @@ class Contract extends Controller
|
||||
x.update();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
throw Ok("/contractAdmin/view/"+c.id, t._("Contract updated"));
|
||||
throw Ok("/contractAdmin/view/" + c.id, t._("Contract updated"));
|
||||
}
|
||||
|
||||
view.form = form;
|
||||
@@ -223,8 +217,7 @@ class Contract extends Controller
|
||||
|
||||
@tpl("contract/insertChoose.mtt")
|
||||
function doInsertChoose() {
|
||||
//checkToken();
|
||||
|
||||
// checkToken();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -232,27 +225,29 @@ class Contract extends Controller
|
||||
*/
|
||||
@tpl("form.mtt")
|
||||
function doInsert(?type:Int) {
|
||||
if (!app.user.canManageAllContracts()) throw Error('/', t._("Forbidden action"));
|
||||
if (type == null) throw Redirect('/contract/insertChoose');
|
||||
if (!app.user.canManageAllContracts())
|
||||
throw Error('/', t._("Forbidden action"));
|
||||
if (type == null)
|
||||
throw Redirect('/contract/insertChoose');
|
||||
|
||||
view.title = if (type == db.Contract.TYPE_CONSTORDERS)t._("Create a contract with fixed orders") else t._("Create a contract with variable orders");
|
||||
view.title = if (type == db.Contract.TYPE_CONSTORDERS) t._("Create a contract with fixed orders") else t._("Create a contract with variable orders");
|
||||
|
||||
var c = new db.Contract();
|
||||
|
||||
var form = Form.fromSpod(c);
|
||||
form.removeElement( form.getElement("amapId") );
|
||||
form.removeElement(form.getElement("amapId"));
|
||||
form.removeElement(form.getElement("type"));
|
||||
form.getElement("userId").required = true;
|
||||
|
||||
if (form.checkToken()) {
|
||||
form.toSpod(c);
|
||||
c.amap = app.user.amap;
|
||||
//trace(app.user.amap);
|
||||
//trace(c.amap);
|
||||
// trace(app.user.amap);
|
||||
// trace(c.amap);
|
||||
c.type = type;
|
||||
c.insert();
|
||||
|
||||
//right
|
||||
// right
|
||||
if (c.contact != null) {
|
||||
var ua = db.UserAmap.get(c.contact, app.user.amap, true);
|
||||
ua.giveRight(ContractAdmin(c.id));
|
||||
@@ -261,7 +256,7 @@ class Contract extends Controller
|
||||
ua.update();
|
||||
}
|
||||
|
||||
throw Ok("/contractAdmin/view/"+c.id, t._("New contract created"));
|
||||
throw Ok("/contractAdmin/view/" + c.id, t._("New contract created"));
|
||||
}
|
||||
|
||||
view.form = form;
|
||||
@@ -271,24 +266,25 @@ class Contract extends Controller
|
||||
* Delete a contract (... and its products, orders & distributions)
|
||||
*/
|
||||
function doDelete(c:db.Contract) {
|
||||
|
||||
if (!app.user.canManageAllContracts()) throw Error("/contractAdmin", t._("You don't have the authorization to remove a contract"));
|
||||
if (!app.user.canManageAllContracts())
|
||||
throw Error("/contractAdmin", t._("You don't have the authorization to remove a contract"));
|
||||
|
||||
if (checkToken()) {
|
||||
c.lock();
|
||||
|
||||
//check if there is orders in this contract
|
||||
// check if there is orders in this contract
|
||||
var products = c.getProducts();
|
||||
|
||||
var orders = db.UserContract.manager.search($productId in Lambda.map(products, function(p) return p.id));
|
||||
var qt = 0.0;
|
||||
for ( o in orders) qt += o.quantity; //there could be "zero c qt" orders
|
||||
for (o in orders)
|
||||
qt += o.quantity; // there could be "zero c qt" orders
|
||||
if (qt > 0) {
|
||||
throw Error("/contractAdmin", t._("You cannot delete this contract because some orders are linked to it."));
|
||||
}
|
||||
|
||||
//remove admin rights and delete contract
|
||||
if(c.contact!=null){
|
||||
// remove admin rights and delete contract
|
||||
if (c.contact != null) {
|
||||
var ua = db.UserAmap.get(c.contact, c.amap, true);
|
||||
if (ua != null) {
|
||||
ua.removeRight(ContractAdmin(c.id));
|
||||
@@ -314,89 +310,89 @@ class Contract extends Controller
|
||||
*
|
||||
*/
|
||||
@tpl("contract/order.mtt")
|
||||
function doOrder(c:db.Contract ) {
|
||||
|
||||
//checks
|
||||
if (app.user.amap.hasPayments()) throw Redirect("/contract/orderAndPay/" + c.id);
|
||||
if (app.user.amap.hasShopMode()) throw Redirect("/shop");
|
||||
if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
|
||||
|
||||
function doOrder(c:db.Contract) {
|
||||
// checks
|
||||
if (app.user.amap.hasPayments())
|
||||
throw Redirect("/contract/orderAndPay/" + c.id);
|
||||
if (app.user.amap.hasShopMode())
|
||||
throw Redirect("/shop");
|
||||
if (!c.isUserOrderAvailable())
|
||||
throw Error("/", t._("This contract is not opened for orders"));
|
||||
|
||||
var distributions = [];
|
||||
// If its a varying contract, we display a column by distribution
|
||||
if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
distributions = db.Distribution.getOpenToOrdersDeliveries(c);
|
||||
}else{
|
||||
} else {
|
||||
distributions = [null];
|
||||
}
|
||||
|
||||
//list of distribs with a list of product and optionnaly an order
|
||||
var userOrders = new Array< {distrib:db.Distribution,datas:Array<{order:db.UserContract,product:db.Product}>} >();
|
||||
// list of distribs with a list of product and optionnaly an order
|
||||
var userOrders = new Array<{distrib:db.Distribution, datas:Array<{order:db.UserContract, product:db.Product}>}>();
|
||||
var products = c.getProducts();
|
||||
|
||||
if ( c.type == db.Contract.TYPE_VARORDER ){
|
||||
|
||||
for ( d in distributions){
|
||||
if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
for (d in distributions) {
|
||||
var datas = [];
|
||||
for ( p in products) {
|
||||
var ua = { order:null, product:p };
|
||||
for (p in products) {
|
||||
var ua = {order: null, product: p};
|
||||
|
||||
var order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId==d.id, true);
|
||||
var order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId == d.id, true);
|
||||
|
||||
if (order != null) ua.order = order;
|
||||
if (order != null)
|
||||
ua.order = order;
|
||||
datas.push(ua);
|
||||
}
|
||||
|
||||
userOrders.push({distrib:d,datas:datas});
|
||||
userOrders.push({distrib: d, datas: datas});
|
||||
}
|
||||
|
||||
}else{
|
||||
|
||||
} else {
|
||||
var datas = [];
|
||||
for ( p in products) {
|
||||
var ua = { order:null, product:p };
|
||||
for (p in products) {
|
||||
var ua = {order: null, product: p};
|
||||
|
||||
var order = db.UserContract.manager.select($user == app.user && $productId == p.id, true);
|
||||
|
||||
if (order != null) ua.order = order;
|
||||
if (order != null)
|
||||
ua.order = order;
|
||||
datas.push(ua);
|
||||
}
|
||||
|
||||
userOrders.push({distrib:null,datas:datas});
|
||||
|
||||
userOrders.push({distrib: null, datas: datas});
|
||||
}
|
||||
|
||||
|
||||
//form check
|
||||
// form check
|
||||
if (checkToken()) {
|
||||
|
||||
//get dsitrib if needed
|
||||
//var distrib : db.Distribution = null;
|
||||
//if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
//distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
|
||||
//}
|
||||
// get dsitrib if needed
|
||||
// var distrib : db.Distribution = null;
|
||||
// if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
// distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
|
||||
// }
|
||||
|
||||
for (k in app.params.keys()) {
|
||||
|
||||
if (k.substr(0, 1) != "d") continue;
|
||||
if (k.substr(0, 1) != "d")
|
||||
continue;
|
||||
var qt = app.params.get(k);
|
||||
if (qt == "") continue;
|
||||
if (qt == "")
|
||||
continue;
|
||||
|
||||
var pid = null;
|
||||
var did = null;
|
||||
try{
|
||||
try {
|
||||
pid = Std.parseInt(k.split("-")[1].substr(1));
|
||||
did = Std.parseInt(k.split("-")[0].substr(1));
|
||||
}catch (e:Dynamic){trace("unable to parse key "+k); }
|
||||
} catch (e:Dynamic) {
|
||||
trace("unable to parse key " + k);
|
||||
}
|
||||
|
||||
//find related element in userOrders
|
||||
// find related element in userOrders
|
||||
var uo = null;
|
||||
for ( x in userOrders){
|
||||
if (x.distrib!=null && x.distrib.id != did) {
|
||||
for (x in userOrders) {
|
||||
if (x.distrib != null && x.distrib.id != did) {
|
||||
continue;
|
||||
}else{
|
||||
for (a in x.datas){
|
||||
if (a.product.id == pid){
|
||||
} else {
|
||||
for (a in x.datas) {
|
||||
if (a.product.id == pid) {
|
||||
uo = a;
|
||||
break;
|
||||
}
|
||||
@@ -404,43 +400,43 @@ class Contract extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
if (uo == null) throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ:pid, deliv:did});
|
||||
if (uo == null)
|
||||
throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ: pid, deliv: did});
|
||||
|
||||
var q = 0.0;
|
||||
|
||||
if (uo.product.hasFloatQt ) {
|
||||
if (uo.product.hasFloatQt) {
|
||||
var param = StringTools.replace(qt, ",", ".");
|
||||
q = Std.parseFloat(param);
|
||||
}else {
|
||||
} else {
|
||||
q = Std.parseInt(qt);
|
||||
}
|
||||
|
||||
|
||||
if (uo.order != null) {
|
||||
OrderService.edit(uo.order, q);
|
||||
}else {
|
||||
} else {
|
||||
OrderService.make(app.user, q, uo.product, did);
|
||||
}
|
||||
|
||||
}
|
||||
throw Ok("/contract/order/"+c.id, t._("Your order has been updated"));
|
||||
throw Ok("/contract/order/" + c.id, t._("Your order has been updated"));
|
||||
}
|
||||
|
||||
view.c = view.contract = c;
|
||||
view.userOrders = userOrders;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Make an order by contract ( standard mode ) + payment process
|
||||
*/
|
||||
@tpl("contract/orderAndPay.mtt")
|
||||
function doOrderAndPay(c:db.Contract ) {
|
||||
|
||||
//checks
|
||||
if (!app.user.amap.hasPayments()) throw Redirect("/contract/order/" + c.id);
|
||||
if (app.user.amap.hasShopMode()) throw Redirect("/");
|
||||
if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
|
||||
function doOrderAndPay(c:db.Contract) {
|
||||
// checks
|
||||
if (!app.user.amap.hasPayments())
|
||||
throw Redirect("/contract/order/" + c.id);
|
||||
if (app.user.amap.hasShopMode())
|
||||
throw Redirect("/");
|
||||
if (!c.isUserOrderAvailable())
|
||||
throw Error("/", t._("This contract is not opened for orders"));
|
||||
|
||||
var distributions = [];
|
||||
/* If its a varying contract, we display a column by distribution*/
|
||||
@@ -448,64 +444,64 @@ class Contract extends Controller
|
||||
distributions = db.Distribution.getOpenToOrdersDeliveries(c);
|
||||
}
|
||||
|
||||
//list of distribs with a list of product and optionnaly an order
|
||||
var userOrders = new Array< {distrib:db.Distribution,datas:Array<{order:db.UserContract,product:db.Product}>} >();
|
||||
// list of distribs with a list of product and optionnaly an order
|
||||
var userOrders = new Array<{distrib:db.Distribution, datas:Array<{order:db.UserContract, product:db.Product}>}>();
|
||||
var products = c.getProducts();
|
||||
|
||||
for ( d in distributions){
|
||||
for (d in distributions) {
|
||||
var datas = [];
|
||||
for ( p in products) {
|
||||
var ua = { order:null, product:p };
|
||||
for (p in products) {
|
||||
var ua = {order: null, product: p};
|
||||
|
||||
var order : db.UserContract = null;
|
||||
var order:db.UserContract = null;
|
||||
if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId==d.id, true);
|
||||
}else {
|
||||
order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId == d.id, true);
|
||||
} else {
|
||||
order = db.UserContract.manager.select($user == app.user && $productId == p.id, true);
|
||||
}
|
||||
|
||||
if (order != null) ua.order = order;
|
||||
if (order != null)
|
||||
ua.order = order;
|
||||
datas.push(ua);
|
||||
}
|
||||
|
||||
userOrders.push({distrib:d,datas:datas});
|
||||
userOrders.push({distrib: d, datas: datas});
|
||||
}
|
||||
|
||||
|
||||
//form check
|
||||
// form check
|
||||
if (checkToken()) {
|
||||
|
||||
//get distrib if needed
|
||||
// get distrib if needed
|
||||
var distrib = null;
|
||||
if (c.type == db.Contract.TYPE_VARORDER) {
|
||||
distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
|
||||
}
|
||||
|
||||
var orders : OrderInSession = {products:[],userId:app.user.id,total:0};
|
||||
var orders:OrderInSession = {products: [], userId: app.user.id, total: 0};
|
||||
|
||||
for (k in app.params.keys()) {
|
||||
|
||||
if (k.substr(0, 1) != "d") continue;
|
||||
if (k.substr(0, 1) != "d")
|
||||
continue;
|
||||
var qt = app.params.get(k);
|
||||
if (qt == "") continue;
|
||||
if (qt == "")
|
||||
continue;
|
||||
|
||||
var pid = null;
|
||||
var did = null;
|
||||
try{
|
||||
try {
|
||||
pid = Std.parseInt(k.split("-")[1].substr(1));
|
||||
did = Std.parseInt(k.split("-")[0].substr(1));
|
||||
}catch (e:Dynamic){
|
||||
trace("unable to parse key "+k);
|
||||
} catch (e:Dynamic) {
|
||||
trace("unable to parse key " + k);
|
||||
}
|
||||
|
||||
//find related element in userOrders
|
||||
// find related element in userOrders
|
||||
var uo = null;
|
||||
for ( x in userOrders){
|
||||
if (x.distrib!=null && x.distrib.id != did) {
|
||||
for (x in userOrders) {
|
||||
if (x.distrib != null && x.distrib.id != did) {
|
||||
continue;
|
||||
}else{
|
||||
for (a in x.datas){
|
||||
if (a.product.id == pid){
|
||||
} else {
|
||||
for (a in x.datas) {
|
||||
if (a.product.id == pid) {
|
||||
uo = a;
|
||||
break;
|
||||
}
|
||||
@@ -513,58 +509,53 @@ class Contract extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
if (uo == null) throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ:pid, deliv:did});
|
||||
if (uo == null)
|
||||
throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ: pid, deliv: did});
|
||||
|
||||
//quantity
|
||||
// quantity
|
||||
var q = 0.0;
|
||||
if (uo.product.hasFloatQt ) {
|
||||
if (uo.product.hasFloatQt) {
|
||||
var param = StringTools.replace(qt, ",", ".");
|
||||
q = Std.parseFloat(param);
|
||||
}else {
|
||||
} else {
|
||||
q = Std.parseInt(qt);
|
||||
}
|
||||
|
||||
orders.products.push({productId:pid, quantity:q, distributionId:did});
|
||||
orders.products.push({productId: pid, quantity: q, distributionId: did});
|
||||
|
||||
var p = db.Product.manager.get(pid, false);
|
||||
orders.total += p.getPrice() * q;
|
||||
|
||||
}
|
||||
|
||||
App.current.session.data.order = orders;
|
||||
|
||||
//Go to payments page
|
||||
// Go to payments page
|
||||
if (c.type == db.Contract.TYPE_CONSTORDERS) {
|
||||
throw Ok("/contract/order/"+c.id, t._("Your CSA order has been saved"));
|
||||
}else{
|
||||
throw Ok("/contract/order/" + c.id, t._("Your CSA order has been saved"));
|
||||
} else {
|
||||
throw Ok("/transaction/pay/", t._("In order to save your order, please choose a means of payment."));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
view.c = view.contract = c;
|
||||
view.userOrders = userOrders;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* A user edit an order for a multidistrib.
|
||||
*/
|
||||
@tpl("contract/orderByDate.mtt")
|
||||
function doEditOrderByDate(date:Date) {
|
||||
|
||||
if (app.user.amap.hasPayments()) {
|
||||
//when payments are active, the user cannot modify his order
|
||||
// when payments are active, the user cannot modify his order
|
||||
throw Redirect("/");
|
||||
}
|
||||
|
||||
// cannot edit order if date is in the past
|
||||
if (Date.now().getTime() > date.getTime()) {
|
||||
|
||||
var msg = t._("This delivery has already taken place, you can no longer modify the order.");
|
||||
if (app.user.isContractManager()) msg += t._("<br/>As the manager of the contract you can modify the order from this page: <a href='/contractAdmin'>Management of contracts</a>");
|
||||
if (app.user.isContractManager())
|
||||
msg += t._("<br/>As the manager of the contract you can modify the order from this page: <a href='/contractAdmin'>Management of contracts</a>");
|
||||
|
||||
throw Error("/contract", msg);
|
||||
}
|
||||
@@ -574,39 +565,40 @@ class Contract extends Controller
|
||||
var d2 = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
|
||||
|
||||
var cids = Lambda.map(app.user.amap.getActiveContracts(true), function(c) return c.id);
|
||||
var distribs = db.Distribution.manager.search(($contractId in cids) && $date >= d1 && $date <=d2 , false);
|
||||
var orders = db.UserContract.manager.search($userId==app.user.id && $distributionId in Lambda.map(distribs,function(d)return d.id) );
|
||||
var distribs = db.Distribution.manager.search(($contractId in cids) && $date >= d1 && $date <= d2, false);
|
||||
var orders = db.UserContract.manager.search($userId == app.user.id
|
||||
&& $distributionId in Lambda.map(distribs, function(d) return d.id));
|
||||
view.orders = service.OrderService.prepare(orders);
|
||||
view.date = date;
|
||||
|
||||
//form check
|
||||
// form check
|
||||
if (checkToken()) {
|
||||
|
||||
var orders_out = [];
|
||||
|
||||
for (k in app.params.keys()) {
|
||||
var param = app.params.get(k);
|
||||
if (k.substr(0, "product".length) == "product") {
|
||||
|
||||
//trouve le produit dans userOrders
|
||||
// trouve le produit dans userOrders
|
||||
var pid = Std.parseInt(k.substr("product".length));
|
||||
var order = Lambda.find(orders, function(uo) return uo.product.id == pid);
|
||||
if (order == null) throw t._("Error, could not find the order");
|
||||
if (order == null)
|
||||
throw t._("Error, could not find the order");
|
||||
|
||||
var q = 0.0;
|
||||
if (order.product.hasFloatQt ) {
|
||||
if (order.product.hasFloatQt) {
|
||||
param = StringTools.replace(param, ",", ".");
|
||||
q = Std.parseFloat(param);
|
||||
}else {
|
||||
} else {
|
||||
q = Std.parseInt(param);
|
||||
}
|
||||
|
||||
var quantity = Math.abs( q==null?0:q );
|
||||
var quantity = Math.abs(q == null ? 0 : q);
|
||||
|
||||
if ( order.distribution.canOrderNow() ) {
|
||||
//met a jour la commande
|
||||
if (order.distribution.canOrderNow()) {
|
||||
// met a jour la commande
|
||||
var o = OrderService.edit(order, quantity);
|
||||
if(o!=null) orders_out.push( o );
|
||||
if (o != null)
|
||||
orders_out.push(o);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,8 +19,6 @@ class ContractAdmin extends Controller {
|
||||
if (!app.user.isContractManager())
|
||||
throw Error("/", t._("You don't have the authorization to manage contracts"));
|
||||
view.nav = ["contractadmin"];
|
||||
|
||||
App.log("first message");
|
||||
}
|
||||
|
||||
public function sendNav(c) {
|
||||
|
||||
@@ -31,8 +31,8 @@ class Messages extends Controller {
|
||||
var lists = getLists();
|
||||
form.addElement(new StringInput("senderName", t._("Sender name"), senderName, true));
|
||||
form.addElement(new StringInput("senderMail", t._("Sender E-Mail"), senderMail, true));
|
||||
form.addElement(new StringSelect("list", t._("Recipients"), lists, "1", true, null, "style='width:500px;'"));
|
||||
form.addElement(new StringInput("subject", t._("Subject:"), "", false, null, "style='width:500px;'"));
|
||||
form.addElement(new StringSelect("list", t._("Recipients"), lists, "3", true, null, "style='width:500px;'"));
|
||||
form.addElement(new StringInput("subject", t._("Subject:"), "", true, null, "style='width:500px;'"));
|
||||
form.addElement(new TextArea("text", t._("Message:"), "", false, null, "style='width:500px;height:350px;'"));
|
||||
|
||||
if (form.checkToken()) {
|
||||
@@ -52,7 +52,7 @@ class Messages extends Controller {
|
||||
// send mail confirmation link
|
||||
var e = new sugoi.mail.Mail();
|
||||
e.setSender(App.config.get("default_email"), t._("Cagette.net"));
|
||||
e.setSubject(subject);
|
||||
e.setSubject('[cagettepei] $subject');
|
||||
|
||||
var replyTo = form.getValueOf("senderMail");
|
||||
var replyToName = form.getValueOf("senderName");
|
||||
@@ -63,9 +63,13 @@ class Messages extends Controller {
|
||||
e.addRecipient(x);
|
||||
|
||||
var text:String = form.getValueOf("text");
|
||||
if (text == null)
|
||||
text = "";
|
||||
var html = app.processTemplate("mail/message.mtt", {text: text, group: app.user.amap, list: getListName(listId)});
|
||||
e.setHtmlBody(html);
|
||||
|
||||
App.log('text=[$text]');
|
||||
App.log('html= ${e.getHtmlBody()}');
|
||||
App.sendMail(e, app.user.getAmap(), listId, app.user);
|
||||
|
||||
// store message
|
||||
@@ -82,8 +86,6 @@ class Messages extends Controller {
|
||||
lm.insert();
|
||||
|
||||
throw Ok("/messages", t._("The message has been sent"));
|
||||
} else {
|
||||
App.log('Administrator #${app.user.id} <${senderName}> prepares sending an email from choices list');
|
||||
}
|
||||
|
||||
view.form = form;
|
||||
|
||||
+72
-87
@@ -1,4 +1,5 @@
|
||||
package controller;
|
||||
|
||||
import haxe.crypto.Md5;
|
||||
import sugoi.form.elements.Input;
|
||||
import sugoi.form.Form;
|
||||
@@ -7,57 +8,50 @@ import sugoi.form.elements.StringInput;
|
||||
import sugoi.form.validators.EmailValidator;
|
||||
import ufront.mail.*;
|
||||
|
||||
class User extends Controller
|
||||
{
|
||||
public function new()
|
||||
{
|
||||
class User extends Controller {
|
||||
public function new() {
|
||||
super();
|
||||
}
|
||||
|
||||
@tpl("user/default.mtt")
|
||||
function doDefault() {
|
||||
|
||||
}
|
||||
|
||||
function doDefault() {}
|
||||
|
||||
@tpl("user/login.mtt")
|
||||
function doLogin() {
|
||||
|
||||
if (App.current.user != null) {
|
||||
throw Redirect('/');
|
||||
}
|
||||
|
||||
//if its needed to redirect after login
|
||||
if (app.params.exists("redirect")){
|
||||
// if its needed to redirect after login
|
||||
if (app.params.exists("redirect")) {
|
||||
view.redirect = app.params.exists("redirect");
|
||||
}else{
|
||||
} else {
|
||||
view.redirect = "/";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Choose which group to connect to.
|
||||
*/
|
||||
@logged
|
||||
@tpl("user/choose.mtt")
|
||||
function doChoose(?args: { amap:db.Amap } ) {
|
||||
|
||||
if (app.user == null) throw t._("You are not connected");
|
||||
function doChoose(?args:{amap:db.Amap}) {
|
||||
if (app.user == null)
|
||||
throw t._("You are not connected");
|
||||
|
||||
var amaps = db.UserAmap.manager.search($user == app.user, false);
|
||||
|
||||
if (amaps.length == 1 && !app.params.exists("show")) {
|
||||
//qu'une amap
|
||||
// qu'une amap
|
||||
app.session.data.amapId = amaps.first().amap.id;
|
||||
throw Redirect('/');
|
||||
}else{
|
||||
view.noGroup = true; //force template to not display current group
|
||||
} else {
|
||||
view.noGroup = true; // force template to not display current group
|
||||
}
|
||||
|
||||
if (args!=null && args.amap!=null) {
|
||||
//select a group
|
||||
var which = app.session.data==null ? 0 : app.session.data.whichUser ;
|
||||
if (args != null && args.amap != null) {
|
||||
// select a group
|
||||
var which = app.session.data == null ? 0 : app.session.data.whichUser;
|
||||
app.session.data.order = null;
|
||||
app.session.data.newGroup = null;
|
||||
app.session.data.amapId = args.amap.id;
|
||||
@@ -68,7 +62,6 @@ class User extends Controller
|
||||
view.amaps = amaps;
|
||||
view.wl = db.WaitingList.manager.search($user == app.user, false);
|
||||
|
||||
|
||||
#if plugins
|
||||
view.pros = pro.db.PUserCompany.getCompanies(app.user);
|
||||
#end
|
||||
@@ -84,75 +77,76 @@ class User extends Controller
|
||||
* when password is forgotten
|
||||
*/
|
||||
@tpl("user/forgottenPassword.mtt")
|
||||
function doForgottenPassword(?key:String, ?u:db.User){
|
||||
|
||||
//STEP 1
|
||||
function doForgottenPassword(?key:String, ?u:db.User) {
|
||||
// STEP 1
|
||||
var step = 1;
|
||||
var error : String = null;
|
||||
var error:String = null;
|
||||
var url = "/user/forgottenPassword";
|
||||
|
||||
//ask for mail
|
||||
// ask for mail
|
||||
var askmailform = new Form("askemail");
|
||||
askmailform.addElement(new StringInput("email", t._("Please key-in your E-Mail address"),null,true));
|
||||
askmailform.addElement(new StringInput("email", t._("Please key-in your E-Mail address"), null, true));
|
||||
|
||||
//change pass form
|
||||
// change pass form
|
||||
var chpassform = new Form("chpass");
|
||||
|
||||
var pass1 = new StringInput("pass1", t._("Your new password"),null,true);
|
||||
var pass1 = new StringInput("pass1", t._("Your new password"), null, true);
|
||||
pass1.password = true;
|
||||
chpassform.addElement(pass1);
|
||||
|
||||
var pass2 = new StringInput("pass2", t._("Again your new password"),null,true);
|
||||
var pass2 = new StringInput("pass2", t._("Again your new password"), null, true);
|
||||
pass2.password = true;
|
||||
chpassform.addElement(pass2);
|
||||
|
||||
var uid = new IntInput("uid","uid", u == null?null:u.id);
|
||||
var uid = new IntInput("uid", "uid", u == null ? null : u.id);
|
||||
uid.inputType = ITHidden;
|
||||
chpassform.addElement(uid);
|
||||
|
||||
if (askmailform.isValid()) {
|
||||
//STEP 2
|
||||
//send password renewal email
|
||||
// STEP 2
|
||||
// send password renewal email
|
||||
step = 2;
|
||||
|
||||
var email :String = askmailform.getValueOf("email");
|
||||
var email:String = askmailform.getValueOf("email");
|
||||
var user = db.User.manager.select(email == $email, false);
|
||||
//could be user 2
|
||||
if(user==null) user = db.User.manager.select(email == $email2, false);
|
||||
// could be user 2
|
||||
if (user == null)
|
||||
user = db.User.manager.select(email == $email2, false);
|
||||
|
||||
//user not found
|
||||
if (user == null) throw Error(url, t._("This E-mail is not linked to a known account"));
|
||||
// user not found
|
||||
if (user == null)
|
||||
throw Error(url, t._("This E-mail is not linked to a known account"));
|
||||
|
||||
//create token
|
||||
var token = haxe.crypto.Md5.encode("chp"+Std.random(1000000000));
|
||||
// create token
|
||||
var token = haxe.crypto.Md5.encode("chp" + Std.random(1000000000));
|
||||
sugoi.db.Cache.set(token, user.id, 60 * 60 * 24 * 30);
|
||||
|
||||
var m = new sugoi.mail.Mail();
|
||||
m.setSender(App.config.get("default_email"), t._("Cagette.net"));
|
||||
m.setRecipient(email, user.name);
|
||||
m.setSubject( "["+App.config.NAME+"] : "+t._("Password change"));
|
||||
m.setHtmlBody( app.processTemplate('mail/forgottenPassword.mtt', { user:user, link:'http://' + App.config.HOST + '/user/forgottenPassword/'+token+"/"+user.id }) );
|
||||
m.setSubject("[" + App.config.NAME + "] " + t._("Password change"));
|
||||
m.setHtmlBody(app.processTemplate('mail/forgottenPassword.mtt',
|
||||
{user: user, link: 'http://' + App.config.HOST + '/user/forgottenPassword/' + token + "/" + user.id}));
|
||||
App.sendMail(m);
|
||||
}
|
||||
|
||||
if (key != null && u!=null) {
|
||||
//check key and propose to change pass
|
||||
if (key != null && u != null) {
|
||||
// check key and propose to change pass
|
||||
step = 3;
|
||||
|
||||
if ( u.id == sugoi.db.Cache.get(key) ) {
|
||||
if (u.id == sugoi.db.Cache.get(key)) {
|
||||
view.form = chpassform;
|
||||
}else {
|
||||
} else {
|
||||
error = t._("Invalid request");
|
||||
}
|
||||
}
|
||||
|
||||
if (chpassform.isValid()) {
|
||||
//change pass
|
||||
// change pass
|
||||
step = 4;
|
||||
|
||||
if ( chpassform.getValueOf("pass1") == chpassform.getValueOf("pass2")) {
|
||||
|
||||
var uid = Std.parseInt( chpassform.getValueOf("uid") );
|
||||
if (chpassform.getValueOf("pass1") == chpassform.getValueOf("pass2")) {
|
||||
var uid = Std.parseInt(chpassform.getValueOf("uid"));
|
||||
var user = db.User.manager.get(uid, true);
|
||||
var pass = chpassform.getValueOf("pass1");
|
||||
user.setPass(pass);
|
||||
@@ -161,20 +155,21 @@ class User extends Controller
|
||||
var m = new sugoi.mail.Mail();
|
||||
m.setSender(App.config.get("default_email"), t._("Cagette.net"));
|
||||
m.setRecipient(user.email, user.name);
|
||||
if(user.email2!=null) m.setRecipient(user.email2, user.name);
|
||||
m.setSubject( "["+App.config.NAME+"] : "+t._("New password confirmed"));
|
||||
if (user.email2 != null)
|
||||
m.setRecipient(user.email2, user.name);
|
||||
m.setSubject("[" + App.config.NAME + "] : " + t._("New password confirmed"));
|
||||
var emails = [user.email];
|
||||
if(user.email2!=null) emails.push(user.email2);
|
||||
if (user.email2 != null)
|
||||
emails.push(user.email2);
|
||||
var params = {
|
||||
user:user,
|
||||
emails:emails.join(", "),
|
||||
password:pass,
|
||||
NAME:App.config.NAME
|
||||
user: user,
|
||||
emails: emails.join(", "),
|
||||
password: pass,
|
||||
NAME: App.config.NAME
|
||||
}
|
||||
m.setHtmlBody( app.processTemplate('mail/newPasswordConfirmed.mtt', params) );
|
||||
m.setHtmlBody(app.processTemplate('mail/newPasswordConfirmed.mtt', params));
|
||||
App.sendMail(m);
|
||||
|
||||
}else {
|
||||
} else {
|
||||
error = t._("You must key-in two times the same password");
|
||||
}
|
||||
}
|
||||
@@ -187,20 +182,18 @@ class User extends Controller
|
||||
view.error = error;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* generate a custom key for transactionnal emails, valid during the current day
|
||||
*/
|
||||
//function getKey(m:db.User) {
|
||||
//return haxe.crypto.Md5.encode(App.config.get("key")+m.email+(Date.now().getDate())).substr(0,12);
|
||||
//}
|
||||
|
||||
// function getKey(m:db.User) {
|
||||
// return haxe.crypto.Md5.encode(App.config.get("key")+m.email+(Date.now().getDate())).substr(0,12);
|
||||
// }
|
||||
|
||||
@logged
|
||||
@tpl("form.mtt")
|
||||
function doDefinePassword(?key:String, ?u:db.User){
|
||||
|
||||
if (app.user.isFullyRegistred()) throw Error("/", t._("You already have a password"));
|
||||
function doDefinePassword(?key:String, ?u:db.User) {
|
||||
if (app.user.isFullyRegistred())
|
||||
throw Error("/", t._("You already have a password"));
|
||||
|
||||
var form = new Form("definepass");
|
||||
var pass1 = new StringInput("pass1", t._("Your new password"));
|
||||
@@ -211,16 +204,13 @@ class User extends Controller
|
||||
form.addElement(pass2);
|
||||
|
||||
if (form.isValid()) {
|
||||
|
||||
if ( form.getValueOf("pass1") == form.getValueOf("pass2")) {
|
||||
|
||||
if (form.getValueOf("pass1") == form.getValueOf("pass2")) {
|
||||
app.user.lock();
|
||||
app.user.setPass(form.getValueOf("pass1"));
|
||||
app.user.update();
|
||||
throw Ok('/', t._("Congratulations, your account is now protected by a password."));
|
||||
|
||||
}else {
|
||||
form.addError( t._("You must key-in two times the same password"));
|
||||
} else {
|
||||
form.addError(t._("You must key-in two times the same password"));
|
||||
}
|
||||
}
|
||||
view.form = form;
|
||||
@@ -231,25 +221,20 @@ class User extends Controller
|
||||
* landing page when coming from an invitation
|
||||
* @param k
|
||||
*/
|
||||
public function doValidate(k:String ) {
|
||||
|
||||
public function doValidate(k:String) {
|
||||
var uid = Std.parseInt(sugoi.db.Cache.get("validation" + k));
|
||||
if (uid == null || uid==0) throw Error('/user/login', t._("Your invitation is invalid or expired ($k)"));
|
||||
if (uid == null || uid == 0)
|
||||
throw Error('/user/login', t._("Your invitation is invalid or expired ($k)"));
|
||||
var user = db.User.manager.get(uid, true);
|
||||
|
||||
db.User.login(user, user.email);
|
||||
|
||||
var groups = user.getAmaps();
|
||||
if(groups.length>0) app.session.data.amapId = groups.first().id;
|
||||
if (groups.length > 0)
|
||||
app.session.data.amapId = groups.first().id;
|
||||
|
||||
sugoi.db.Cache.destroy("validation" + k);
|
||||
|
||||
throw Ok("/user/definePassword", t._("Congratulations ::userName::, your account is validated!", {userName:user.getName()}));
|
||||
|
||||
|
||||
|
||||
throw Ok("/user/definePassword", t._("Congratulations ::userName::, your account is validated!", {userName: user.getName()}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,19 +1,18 @@
|
||||
package controller.admin;
|
||||
|
||||
import haxe.web.Dispatch;
|
||||
import Common;
|
||||
|
||||
class Admin extends Controller {
|
||||
|
||||
public function new() {
|
||||
super();
|
||||
view.category = 'admin';
|
||||
|
||||
//trigger a "Nav" event
|
||||
// trigger a "Nav" event
|
||||
var nav = new Array<Link>();
|
||||
var e = Nav(nav,"admin");
|
||||
var e = Nav(nav, "admin");
|
||||
app.event(e);
|
||||
view.nav = e.getParameters()[0];
|
||||
|
||||
}
|
||||
|
||||
@tpl("admin/default.mtt")
|
||||
@@ -24,44 +23,36 @@ class Admin extends Controller {
|
||||
@tpl("admin/emails.mtt")
|
||||
function doEmails() {
|
||||
var browse = function(index:Int, limit:Int) {
|
||||
return sugoi.db.BufferedMail.manager.search($sdate==null,{limit:[index,limit],orderBy:-cdate},false);
|
||||
return sugoi.db.BufferedMail.manager.search($sdate == null, {limit: [index, limit], orderBy: -cdate}, false);
|
||||
}
|
||||
|
||||
var count = sugoi.db.BufferedMail.manager.count($sdate==null);
|
||||
view.browser = new sugoi.tools.ResultsBrowser(count,10,browse);
|
||||
var count = sugoi.db.BufferedMail.manager.count($sdate == null);
|
||||
view.browser = new sugoi.tools.ResultsBrowser(count, 10, browse);
|
||||
view.num = count;
|
||||
|
||||
}
|
||||
|
||||
@tpl("form.mtt")
|
||||
function doSmtp() {
|
||||
|
||||
var f = new sugoi.form.Form("emails");
|
||||
var data = [
|
||||
{label:"SMTP",value:"smtp"},
|
||||
{label:"Mandrill API",value:"mandrill"},
|
||||
];
|
||||
var data = [{label: "SMTP", value: "smtp"}, {label: "Mandrill API", value: "mandrill"},];
|
||||
|
||||
var mailer = sugoi.db.Variable.get("mailer")==null ? "smtp" : sugoi.db.Variable.get("mailer");
|
||||
var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
|
||||
var port = sugoi.db.Variable.get("smtp_port")==null ? App.config.get("smtp_port") : sugoi.db.Variable.get("smtp_port");
|
||||
var user = sugoi.db.Variable.get("smtp_user")==null ? App.config.get("smtp_user") : sugoi.db.Variable.get("smtp_user");
|
||||
var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : sugoi.db.Variable.get("smtp_pass");
|
||||
var mailer = sugoi.db.Variable.get("mailer") == null ? "smtp" : sugoi.db.Variable.get("mailer");
|
||||
var host = sugoi.db.Variable.get("smtp_host") == null ? "<SMTP_SERVER>" : sugoi.db.Variable.get("smtp_host");
|
||||
var port = sugoi.db.Variable.get("smtp_port") == null ? "587" : sugoi.db.Variable.get("smtp_port");
|
||||
var user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
|
||||
var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
|
||||
|
||||
|
||||
f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer ));
|
||||
f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer));
|
||||
f.addElement(new sugoi.form.elements.StringInput("smtp_host", "host", host));
|
||||
f.addElement(new sugoi.form.elements.StringInput("smtp_port", "port", port));
|
||||
f.addElement(new sugoi.form.elements.StringInput("smtp_user", "user", user));
|
||||
f.addElement(new sugoi.form.elements.StringInput("smtp_pass", "pass", pass));
|
||||
|
||||
|
||||
if (f.isValid()){
|
||||
for ( k in ["mailer","smtp_host","smtp_port","smtp_user","smtp_pass"]){
|
||||
if (f.isValid()) {
|
||||
for (k in ["mailer", "smtp_host", "smtp_port", "smtp_user", "smtp_pass"]) {
|
||||
sugoi.db.Variable.set(k, f.getValueOf(k));
|
||||
}
|
||||
throw Ok("/admin/emails", t._("Configuration updated") );
|
||||
|
||||
throw Ok("/admin/emails", t._("Configuration updated"));
|
||||
}
|
||||
|
||||
view.title = t._("Email service configuration");
|
||||
@@ -72,67 +63,60 @@ class Admin extends Controller {
|
||||
d.dispatch(new controller.admin.Plugins());
|
||||
}
|
||||
|
||||
|
||||
@tpl("admin/taxo.mtt")
|
||||
function doTaxo(){
|
||||
|
||||
function doTaxo() {
|
||||
view.categ = db.TxpCategory.manager.all();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Display errors logged in DB
|
||||
*/
|
||||
@tpl("admin/errors.mtt")
|
||||
function doErrors( args:{?user: Int, ?like: String, ?empty:Bool} ) {
|
||||
function doErrors(args:{?user:Int, ?like:String, ?empty:Bool}) {
|
||||
view.now = Date.now();
|
||||
|
||||
view.u = args.user!=null ? db.User.manager.get(args.user,false) : null;
|
||||
view.like = args.like!=null ? args.like : "";
|
||||
view.u = args.user != null ? db.User.manager.get(args.user, false) : null;
|
||||
view.like = args.like != null ? args.like : "";
|
||||
|
||||
var sql = "";
|
||||
if( args.user!=null ) sql += " AND uid="+args.user;
|
||||
//if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
|
||||
if (args.user != null)
|
||||
sql += " AND uid=" + args.user;
|
||||
// if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
|
||||
if (args.empty) {
|
||||
sys.db.Manager.cnx.request("truncate table Error");
|
||||
}
|
||||
|
||||
var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "+sql+" group by day order by day").results();
|
||||
var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "
|
||||
+ sql
|
||||
+ " group by day order by day")
|
||||
.results();
|
||||
view.errorsStats = errorsStats;
|
||||
|
||||
view.browser = new sugoi.tools.ResultsBrowser(
|
||||
sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 "+sql),
|
||||
20,
|
||||
function(start, limit) { return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 "+sql+" ORDER BY date DESC LIMIT "+start+","+limit,false); }
|
||||
);
|
||||
view.browser = new sugoi.tools.ResultsBrowser(sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 " + sql), 20,
|
||||
function(start, limit) {
|
||||
return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 " + sql + " ORDER BY date DESC LIMIT " + start + "," + limit, false);
|
||||
});
|
||||
}
|
||||
|
||||
@tpl("admin/graph.mtt")
|
||||
function doGraph(?key:String,?year:Int,?month:Int){
|
||||
function doGraph(?key:String, ?year:Int, ?month:Int) {
|
||||
var from = new Date(year, month, 1, 0, 0, 0);
|
||||
var to = new Date(year, month + 1, 0, 23, 59, 59);
|
||||
|
||||
|
||||
var from = new Date(year,month,1,0,0,0);
|
||||
var to = new Date(year,month+1,0,23,59,59);
|
||||
|
||||
if(app.params.exists("recompute")){
|
||||
|
||||
switch(key){
|
||||
if (app.params.exists("recompute")) {
|
||||
switch (key) {
|
||||
case "basket":
|
||||
for( d in 1...to.getDate()){
|
||||
var _from = new Date(year,month,d,0,0,0);
|
||||
var _to = new Date(year,month,d,23,59,59);
|
||||
var value = db.Basket.manager.count($cdate>=_from && $cdate<=_to);
|
||||
var g = db.Graph.record(key,value, _from );
|
||||
for (d in 1...to.getDate()) {
|
||||
var _from = new Date(year, month, d, 0, 0, 0);
|
||||
var _to = new Date(year, month, d, 23, 59, 59);
|
||||
var value = db.Basket.manager.count($cdate >= _from && $cdate <= _to);
|
||||
var g = db.Graph.record(key, value, _from);
|
||||
// trace(value,_from,g);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var data = db.Graph.getRange(key,from,to);
|
||||
var data = db.Graph.getRange(key, from, to);
|
||||
view.data = data;
|
||||
view.from = from;
|
||||
view.to = to;
|
||||
@@ -140,55 +124,46 @@ class Admin extends Controller {
|
||||
|
||||
var averageValue = 0.0;
|
||||
var total = 0.0;
|
||||
for( d in data) total += d.value;
|
||||
averageValue = total/data.length;
|
||||
for (d in data)
|
||||
total += d.value;
|
||||
averageValue = total / data.length;
|
||||
view.total = total;
|
||||
view.averageValue = averageValue;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
function doFixDistribValidation() {
|
||||
|
||||
Sys.println("===== Liste des distributions ayant été re-validées ====<br>");
|
||||
|
||||
//Get the current group
|
||||
// Get the current group
|
||||
var group = app.user.amap;
|
||||
//Get all the contracts for this given group
|
||||
var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
|
||||
//Get all the validated distributions for this given group
|
||||
var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
|
||||
for (distrib in validatedDistribs){
|
||||
|
||||
// Get all the contracts for this given group
|
||||
var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
|
||||
// Get all the validated distributions for this given group
|
||||
var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
|
||||
for (distrib in validatedDistribs) {
|
||||
service.PaymentService.validateDistribution(distrib);
|
||||
Sys.println(distrib.toString() + "<br>");
|
||||
|
||||
}
|
||||
|
||||
Sys.println("===== Fin de la liste ====");
|
||||
|
||||
}
|
||||
|
||||
function doCheckDistribValidation() {
|
||||
|
||||
Sys.println("===== Liste des distributions validées ayant des opérations/paiements non validés ====<br>");
|
||||
|
||||
//Get the current group
|
||||
// Get the current group
|
||||
var group = app.user.amap;
|
||||
//Get all the contracts for this given group
|
||||
var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
|
||||
//Get all the validated distributions for this given group
|
||||
var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
|
||||
for (distrib in validatedDistribs){
|
||||
|
||||
for (user in distrib.getUsers()){
|
||||
|
||||
// Get all the contracts for this given group
|
||||
var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
|
||||
// Get all the validated distributions for this given group
|
||||
var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
|
||||
for (distrib in validatedDistribs) {
|
||||
for (user in distrib.getUsers()) {
|
||||
var basket = db.Basket.get(user, distrib.place, distrib.date);
|
||||
if (basket == null || basket.isValidated()) continue;
|
||||
if (basket == null || basket.isValidated())
|
||||
continue;
|
||||
|
||||
for (order in basket.getOrders()){
|
||||
for (order in basket.getOrders()) {
|
||||
if (!order.paid) {
|
||||
Sys.println(order.distribution.toString() + "<br>");
|
||||
Sys.println(order.toString() + "<br>");
|
||||
@@ -196,28 +171,22 @@ class Admin extends Controller {
|
||||
}
|
||||
|
||||
var operation = basket.getOrderOperation(false);
|
||||
if (operation != null){
|
||||
|
||||
if (operation != null) {
|
||||
if (operation.pending) {
|
||||
Sys.println(distrib.toString() + "<br>");
|
||||
Sys.println(operation.toString() + "<br>");
|
||||
}
|
||||
|
||||
for ( payment in basket.getPayments()){
|
||||
|
||||
if (payment.pending){
|
||||
for (payment in basket.getPayments()) {
|
||||
if (payment.pending) {
|
||||
Sys.println(distrib.toString() + "<br>");
|
||||
Sys.println(payment.toString() + "<br>");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Sys.println("===== Fin de la liste ====");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,6 @@ class BaseApp {
|
||||
var PATH = Web.getCwd() + "../";
|
||||
var json = haxe.Json.parse(sys.io.File.getContent(PATH + "package.json"));
|
||||
App.VERSION = json.version;
|
||||
|
||||
App.log('configuration has been reloaded, VERSION=${App.VERSION}');
|
||||
}
|
||||
|
||||
|
||||
+32
-33
@@ -3,61 +3,60 @@ package sugoi;
|
||||
import sugoi.Web;
|
||||
|
||||
class Config {
|
||||
|
||||
public var PATH :String;
|
||||
//public var json : Dynamic;
|
||||
public var xml : Xml;
|
||||
public var LANG :String;
|
||||
public var LANGS :Array<String>;
|
||||
public var TPL :String;
|
||||
public var TPL_TMP :String;
|
||||
public var DEBUG :Bool;
|
||||
public var HOST :String;
|
||||
public var NAME :String;
|
||||
public var KEY :String;
|
||||
public var DATA_HOST :String;
|
||||
public var SQL_LOG :Bool;
|
||||
public var PATH:String;
|
||||
// public var json : Dynamic;
|
||||
public var xml:Xml;
|
||||
public var LANG:String;
|
||||
public var LANGS:Array<String>;
|
||||
public var TPL:String;
|
||||
public var TPL_TMP:String;
|
||||
public var DEBUG:Bool;
|
||||
public var HOST:String;
|
||||
public var NAME:String;
|
||||
public var KEY:String;
|
||||
public var DATA_HOST:String;
|
||||
public var SQL_LOG:Bool;
|
||||
|
||||
public function new(?path:String) {
|
||||
PATH = (path != null) ? path : Web.getCwd() + "../";
|
||||
//json = haxe.Json.parse(sys.io.File.getContent(PATH + "config.json"));
|
||||
xml = Xml.parse(sys.io.File.getContent(PATH + "config.xml")).firstElement();
|
||||
|
||||
LANG = get("lang");
|
||||
LANGS = get("langs").split(";");
|
||||
NAME = get("name", "cagettepei");
|
||||
LANG = get("lang", "fr");
|
||||
LANGS = get("langs", "fr").split(";");
|
||||
|
||||
TPL = PATH + "lang/" + LANG + "/tpl/";
|
||||
TPL_TMP = PATH + "lang/" + LANG + "/tmp/";
|
||||
DEBUG = get("debug","0") == "1";
|
||||
DEBUG = get("debug", "0") == "1";
|
||||
HOST = get("host");
|
||||
NAME = get("name");
|
||||
KEY = get("key");
|
||||
DATA_HOST = get("dataHost","data."+HOST);
|
||||
DATA_HOST = get("dataHost", "data." + HOST);
|
||||
SQL_LOG = getBool("sqllog", false);
|
||||
}
|
||||
|
||||
public function defined( val : String ) {
|
||||
//return Reflect.field(xml,val) != null;
|
||||
public function defined(val:String) {
|
||||
// return Reflect.field(xml,val) != null;
|
||||
return xml.get(val) != null;
|
||||
}
|
||||
|
||||
public function getBool( val : String, ?def ) {
|
||||
public function getBool(val:String, ?def) {
|
||||
var v = get(val);
|
||||
if( v == null ) return def;
|
||||
return( v == "1" || v == "true" );
|
||||
if (v == null)
|
||||
return def;
|
||||
return (v == "1" || v == "true");
|
||||
}
|
||||
|
||||
public function get( val : String, ?def : String ) : String {
|
||||
//var v = Reflect.field(xml,val);
|
||||
public function get(val:String, ?def:String):String {
|
||||
// var v = Reflect.field(xml,val);
|
||||
var v = xml.get(val);
|
||||
if( v == null )
|
||||
if (v == null)
|
||||
v = def;
|
||||
if( v == null )
|
||||
throw "Missing config attribute : '"+val+"'";
|
||||
if (v == null)
|
||||
throw "Missing config attribute : '" + val + "'";
|
||||
return v;
|
||||
}
|
||||
|
||||
public function getInt( val : String, ?def : Int ) : Int {
|
||||
return Std.parseInt(get(val,Std.string(def)));
|
||||
public function getInt(val:String, ?def:Int):Int {
|
||||
return Std.parseInt(get(val, Std.string(def)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+395
-444
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 106 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 112 KiB |
@@ -2237,7 +2237,7 @@ msgid ""
|
||||
"Welcome in the group of ::name::!\n"
|
||||
" You can look at the delivery planning or make a new order."
|
||||
msgstr ""
|
||||
"Bienvenue sur la cagette de ::name:: !\n"
|
||||
"Bienvenue sur le CagettePéi de ::name:: !\n"
|
||||
" Vous pouvez consulter votre planning de distribution ou faire une nouvelle "
|
||||
"commande."
|
||||
|
||||
|
||||
Reference in New Issue
Block a user