In order to better discover Cagette.net, we propose to do a guided tour of the user interface of the software.
You will then have a global overview on the different tools that are available to you.
You will be able to stop and start again this tutorial whenever you want.
"), + action: TANext, + placement : null + }, + { + element:"ul.nav.navbar-left", + text:t._( "This part of the navigation bar is visible by all members.It allows to access to the three main pages:Now click on the Members section
"), + action: TAPage("/member"), + placement : TPBottom + + },{ + element:".article .table td:first", + text:t._("The purpose of this section is to administrate the list of your members.Now click on a member in the list
"), + action: TAPage("/member/view/*"), + placement : TPRight + },{ + element:".article:first", + text:t._("This is the page of a member. Here you can :Here you can manage :
We have seen the main features related to contracts.
Let's see the messaging section.
"), + action: TAPage("/messages"), + placement : TPBottom + + },{ + element:null, + text:t._("The messaging section allows you to send e-mails to different lists of members. It is not necessary anymore to maintain a lot of lists of e-mails depending on contracts, as all these lists are automatically generated.
E-mails are sent with your e-mail address as sender, so you will receive answers in your own mailbox.
"), + action: TANext, + placement : null + + },{ + element:"ul.nav #amapadmin", + text:t._("Click here now on this page"), + action : TAPage("/amapadmin"), + placement : TPBottom, + },{ + element:"#subnav", + text:t._("In this last page, you can configure everything that is related to your group.
The page Access rights is important as it is where you can define other coordinators among members. They will then be able to manage one or many contracts, send emails, etc.
"), + action:TANext, + placement : TPBottom + },{ + element:"#footer", + text:t._("This is the last step of this tutorial. I hope that it gave you a good overview of this software.
To go further, do not hesitate to look at the documentation. The link is always available at the bottom of the screen.
| '); + html.add(" | " + p.product.name+" | "); + var tags = []; + + //trace('product tags ${p.categories} from tags ${data.categories}'); + + for (c in p.categories) { + //trouve le nom du tag + var name = ""; + var color = ""; + for (gc in data.categories) { + for ( t in gc.tags) { + if (c == t.id) { + name = t.name; + color = gc.color; + break; + } + } + } + //var bt = App.jq("[X]") + tags.push(""+name+""); + } + + html.add(""+ tags.join(" ") +" | "); + html.add("
" + s.text + "
"; + var bt = null; + switch(s.action) { + case TANext : + + bt = App.jq(""); + bt.click(function(?_) { + //untyped m.modal('hide'); + new Tuto(name, step + 1); + if(LAST_ELEMENT!=null) App.jq(s.element).removeClass("highlight"); + }); + + default: + } + + //configure and open popover + var p = switch(s.placement) { + case TPTop: "top"; + case TPBottom : "bottom"; + case TPLeft : "left"; + case TPRight : "right"; + default : null; + } + var options = { container:"body", content:text, html:true , placement:p}; + untyped x.popover(options).popover('show'); + + + //add a footer + var footer = App.jq(""); + + if (bt != null) footer.find(".pull-right").append(bt); + footer.find(".pull-left").append(makeCloseButton(t._('Stop'))); + + App.jq(".popover .popover-content").append(footer); + + //highlight + App.jq(s.element).first().addClass("highlight"); + LAST_ELEMENT = s.element; + } + } + + /** + * Make a "close" bt + */ + function makeCloseButton(?text) { + var bt = App.jq(" "+(text==null?"":text)+""); + bt.click(function(?_) { + js.Browser.location.href = "/contract?stopTuto=1"; + }); + return bt; + } + +} \ No newline at end of file diff --git a/js/libs/libs.js b/js/libs/libs.js new file mode 100644 index 0000000..eb7a3f0 --- /dev/null +++ b/js/libs/libs.js @@ -0,0 +1,28 @@ +// +// npm dependencies library +// +(function(scope) { + 'use-strict'; + scope.__registry__ = Object.assign({}, scope.__registry__, { + // + // list npm modules required in Haxe + // + 'bootstrap': require('bootstrap'), + 'react': require('react'), + 'react-dom': require('react-dom'), + 'react-bootstrap-typeahead': require('react-bootstrap-typeahead'), + 'react-datetime': require('react-datetime'), + 'leaflet': require('leaflet'), + 'react-leaflet': require('react-leaflet'), + 'react-places-autocomplete': require('react-places-autocomplete'), + 'geolib': require('geolib'), + 'react-router':require('react-router'), + 'react-router-dom':require('react-router-dom'), + }); + + if (process.env.NODE_ENV !== 'production') { + // enable React hot-reload + require('haxe-modular'); + } + +})(typeof $hx_scope != "undefined" ? $hx_scope : $hx_scope = {}); diff --git a/js/react/DateTimeField.hx b/js/react/DateTimeField.hx new file mode 100644 index 0000000..f687510 --- /dev/null +++ b/js/react/DateTimeField.hx @@ -0,0 +1,7 @@ +package react; + +/** + * @doc https://www.npmjs.com/package/react-bootstrap-datetimepicker + */ +@:jsRequire('react-bootstrap-datetimepicker') +extern class DateTimeField extends react.ReactComponent {} diff --git a/js/react/Error.hx b/js/react/Error.hx new file mode 100644 index 0000000..2676aa6 --- /dev/null +++ b/js/react/Error.hx @@ -0,0 +1,29 @@ +package react; +import react.ReactComponent; +import react.ReactMacro.jsx; +import Common; + +/** + * A Error Div + */ +class Error extends react.ReactComponentOfProps<{error:String}> +{ + + public function new(props:Dynamic) + { + super(props); + } + + + override public function render(){ + + if (props.error == null) return null; + + return jsx('Pour la livraison du ${props.date} à ${props.place}
'); + } + + var renderOrderBox = function() return jsx(' ++ Déjà inscrit ? + Connectez-vous ici +
+| + | ::_("Balance"):: : | + ::if balance<0:: + ::set color = "C00":: + ::else:: + ::set color = "0C0":: + ::end:: ++ ::if balance<0:: + - + ::end:: + | ++ ::Math.abs(balance):: ::currency():: + | ++ | +||
| + + | +||||||
|---|---|---|---|---|---|---|
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec ullamcorper venenatis augue, vitae tempor quam viverra at. + Sed faucibus ipsum sit amet turpis consectetur finibus. Nulla facilisi. + Vivamus consequat vestibulum blandit. Nunc laoreet tellus ac lorem commodo hendrerit. +
++ Nulla gravida, libero et scelerisque convallis, nibh nisi ultrices nulla, sed faucibus sapien augue et turpis. + Nunc quis tempor dolor. Duis elementum nisl eu dolor malesuada convallis. + Sed id tellus euismod, eleifend neque ac, iaculis odio. Cras euismod odio quis elit elementum rhoncus. + Mauris in elementum ex, ut scelerisque leo. Suspendisse viverra mi non neque vulputate, in fermentum sapien sodales. + Sed in laoreet ante. Suspendisse non velit sit amet lectus consequat ornare sit amet quis ipsum. +
+ + ++ ::hDate(now):: +
+ + +::end:: \ No newline at end of file diff --git a/lang/master/tpl/admin/design.mtt b/lang/master/tpl/admin/design.mtt new file mode 100644 index 0000000..39d894d --- /dev/null +++ b/lang/master/tpl/admin/design.mtt @@ -0,0 +1,36 @@ +::use 'design.mtt':: +::_("Emails are temporarily stored in a buffer, waiting to be sent by the cron")::
++
| id | +date | +tries | +title | +html | +status | +|
|---|---|---|---|---|---|---|
| ::e.id:: | +::e.cdate:: | + ::if(e.tries==0):: +::e.tries:: | + ::else:: +::e.tries:: | + ::end:: + +::e.title:: | ++ ::if e.htmlBody != null:: + [show] + + ::end:: + | +::e.rawStatus:: | +
| id | +date | +Error | +infos | +user id | +URL | +
|---|---|---|---|---|---|
| ::r.id:: | +::r.date:: | + + ::set e = r.error.split('Called'):: ++ ::e.shift():: + ::if e.length > 0:: + [stack] + + ::end:: + | ++ [infos] + + | ++ + ::r._user.getName():: + + | +::r.url:: | +
+ Du ::hDate(from):: au ::hDate(to)::
+ Total : ::total::
+ Moyenne : ::averageValue::
+
+
+ + + + + +
++ +
| ::hDate(d.date):: | +::d.value:: | +
+ L'installation des plugins se fait sur la machine de développement. +
+ + +| Nom | +Installé | +|
|---|---|---|
| ::p.name:: | ++ ::set i = p.isInstalled():: + $$bool(::i::) + + ::if i==false:: + Installer + ::end:: + | ++ + | +
+ Cagette.net inclut maintenant un dictionnaire de produits qui permet d'identifier + facilement les produits que vous saisissez. +
+ +
+
+
+ ::sc.name::
+
+ ::foreach p sc.getProducts()::
+ ::p.name::,
+ ::end::
+
+
+ ::c._vendor.name::
+ ::c._vendor.city:: (::c._vendor.zipCode::)
+
+ ::membersNum:: ::_("members")::.
+ ::contractsNum:: ::_("contracts in progress")::.
+
+
+ ::raw _("Your group has a public page, You can use it as a micro-website.
Copy-paste the address of this page and share it !")::
+
+
+ + http://::HOST::/group/::user._amap.id:: + +
+ ++ ::_("Display"):: +
+ + +| ::_("Name"):: | +::_("Rights"):: | +::_("Actions"):: | + +
|---|---|---|
| + ::u._user.getName():: + | +
+
|
+ + $$insert(::_("Modify")::,/amapadmin/editRight/::u.userId::) + | + + +
+ ::raw _("Categories allow to sort your products per category, for example \"vegetables, meet, backery, etc.\"
It is possible to create many groups of categories in order to sort products as we wish.")::
+
+ ::_("You currently have no category. Would you like to create the list of categories by default ?"):: + ::_("Create the list of default categories"):: +
+ +::foreach g groups:: +| + Groupe "::g.name::" + | ++ ::_("Modify group"):: + ::_("Remove group"):: + | +
|---|---|
| + ::c.name:: + | ++ ::_("Modify"):: + ::_("Remove"):: + | +
| + ::_("Add a category in this group"):: + | ++ + |
| ::_("Qty||short version for quantity"):: | +::_("Product"):: | +::_("U.P||short version of price per unit"):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
|---|---|---|---|---|---|---|
| + ::raw m.smartQt:: + | +
+
+ ::_("Order alternated with"):: + ::if user.id == m.userId:: + ::m.userName2:: + ::else:: + ::m.userName:: + ::end:: + ::end:: + + |
+ + ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + + ::formatNum(m.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | ++ ::if m.paid==true:: + ::_("Paid"):: + ::else:: + ::_("Unpaid"):: + ::end:: + | + +
| + Total : + ::formatNum(total):: ::currency():: + + ::set d = c.contract.getDistribs(false,null).length:: + ( soit ::formatNum(d*total):: ::currency():: pour ::d:: livraisons ) + | +||||||
| ::_("Qty||short version for quantity"):: | +::_("Product"):: | +::_("U.P||short version of price per unit"):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
|---|---|---|---|---|---|---|
| + ::raw o.smartQt:: + | +
+
+ |
+ + ::formatNum(o.productPrice):: ::currency():: + | ++ ::formatNum(o.subTotal):: ::currency():: + | ++ $$nullSafe(::formatNum(o.fees)::) + | ++ ::formatNum(o.total):: ::currency():: + ::set total = total + o.total:: + | ++ ::if o.paid==true:: + ::_("Paid"):: + ::else:: + ::_("Unpaid"):: + ::end:: + | + +
| + ::if !user._amap.hasPayments():: + $$edit(Modifier cette commande,/contract/editOrderByDate/::d.date::) + ::end:: + + | +TOTAL | +::formatNum(total):: ::currency():: | +||||
+ $$contact(::user::) +
+ + + + + $$edit(::_("Edit")::,/account/edit) + +| ::t.name:: | ++ ::if t.completion==null:: + + ::_("Start"):: + + ::else:: + + + ::_("Stop"):: + + ::end:: + | +
+ ::_("Current language is"):: + + ::langText:: + +
++ ::_("It is a contract with a duration of one year or for one season. Products are always the same at each delivery"):: +
++ ::raw _("Example: there is a contract for vegetables that is 1 year long. Jean takes a basket that costs 10€ per delivery, and Brigitte takes a basket that costs 15€ per delivery."):: +
++ ::_("It is a contract in which members can change their orders at each delivery. There is a different order for each delivery."):: +
++ ::raw _("Example: Jean orders a basket that costs 10€ for the first delivery, then nothing for the second delivery, then a basket for 20€ etc."):: +
+
+ ::raw _("As long as orders are open, you can come back on this page and modify your order.
You can check any time your current orders on the following page my account.")::
+
+ ::raw _("Key-in here your orders in advance for this supplier.
You can check your current orders any time on the following page my account.
Tip: to remove an order please key-in the quantity 0")::
+
+ ::_("Supplier:"):: ::c._vendor.name:: +
++ ::_("Contact in charge:"):: $$contact(::c._contact::) +
+ +
+ ::raw _("You can modify here an existing order. If you would like to remove a product, just key-in the quantity 0.
You may not be able to modify all elements as the order could be closed for some suppliers")::
+
| + + + + + | +
+ + ::p.getName():: ++ ::formatNum(p.getPrice()):: ::currency():: + + + |
+
+ ::raw nl2br(vendor.desc):: +
+ + ::if vendor.linkUrl!=null:: ++ ::if vendor.linkText!=null:: + ::vendor.linkText:: + ::else:: + ::_("Read more"):: + ::end:: +
+ ::end:: + ++ ::if user._amap.hasShopMode():: + ::_("Order"):: + ::end:: +
++ ::_("No planned distributions."):: +
+ ::else:: ++ ::_("Order"):: +
+ ::end:: + + ++ ::_("You can check your previous orders in 'my account' section"):: +
+ + +| ::p.name:: | +$$edit(modifier,/product/edit/::p.id::) | +
| ::d.date.toString():: | +$$edit(modifier,/distribution/edit/::d.id::) | +
::_("You need to validate these distributions which took place recently")::
+ + ::foreach m multidistribs:: ++ ::if(!m.isConfirmed()):: + + ::dDate(m.getDate())::, ::m.getPlace().name:: + + ::if (isAdmin):: + Admin : Autovalidate + ::end:: + ::elseif(isAdmin):: + + ::dDate(m.getDate())::, ::m.getPlace().name:: + + Admin : Unvalidate + ::end:: +
+ ::end:: + +| + ::if c._vendor._image!=null:: + + ::end:: + | +::c._vendor.name:: | ++ ::c.name:: + | +
+ du ::hDate(c.startDate):: + au ::hDate(c.endDate):: + |
+
+
+
+ $$edit(::_("Manage")::,/contractAdmin/view/::c.id::)
+
+ ::if user.canManageAllContracts()::
+ $$delete(::_("Del.||short version of delete")::,/contract/delete/::c.id::?token=::token::)
+ ::end::
+
+
+ |
+
| + ::if v._image!=null:: + + ::end:: + | +::v.name:: | +
+
+ $$edit(::_("Edit")::,/vendor/edit/::v.id::)
+ ::_("Picture")::
+ ::if user.isAmapManager():: $$delete(,/vendor/delete/::v.id::?token=::token::) ::end::
+
+ |
+
| ::p.name:: | ++ $$edit(::_("Edit")::,/place/edit/::p.id::) + ::if user.isAmapManager():: $$delete(::_("Del.||short version for delete")::,/place/delete/::p.id::?token=::token::) ::end:: + | +
+ ::if d.distributionCycleId!=null::
+ 
+ ::end::
+
+ ::set da = getDate(d.date)::
+
+ ::if d.end!=null::
+
+ ::set e = getDate(d.end)::
+ ::end::
+
+ ::da.dow:: ::da.d:: ::da.m:: de ::da.h+":"+da.i::
+
+ ::if d.end!=null::
+ à ::e.h+":"+e.i::
+ ::end::
+ |
+ + ::d._place.name:: + | +
+
+ $$edit(::_("Edit")::,/distribution/edit/::d.id::)
+ $$delete(::_("Delete")::,/distribution/delete/::d.id::)
+ ::_("Distribution list")::
+
+ |
+
| ::_("Distribution cycle"):: | ++ |
|---|---|
| + ::switch c.cycleType:: + ::case:: ::_("Weekly"):: + ::case:: ::_("Monthly"):: + ::case:: ::_("Every 2 weeks"):: + ::case:: ::_("Every 3 weeks"):: + ::end:: + + : Du ::hDate(c.startDate):: au ::hDate(c.endDate):: + | ++ $$delete(::_("Del.")::,::"/distribution/deleteCycle/"+c.id::) + | +
| ::_("Suscriber"):: | +::raw _("Number of attendances to deliveries"):: | ++ |
|---|---|---|
| + ::p.user.getCoupleName():: + | ++ ::p.count:: + | +
+ ::if p.count>=numRounded::
+  OK
+ ::else::
+  ::_("Insufficient")::
+ ::end::
+ |
+
| ::_("Member without order in this contract"):: | +::raw _("Number of attendances to deliveries"):: | ++ |
|---|---|---|
| ::p.user.getCoupleName():: | +::p.count:: | ++ |
::_("For the delivery of the"):: ::hDate(distribution.date)::
+ ::end:: + + +::end:: \ No newline at end of file diff --git a/lang/master/tpl/contractadmin/orders.mtt b/lang/master/tpl/contractadmin/orders.mtt new file mode 100644 index 0000000..91ca1c3 --- /dev/null +++ b/lang/master/tpl/contractadmin/orders.mtt @@ -0,0 +1,214 @@ +::use 'contractadmin/design.mtt':: + +|
+
+ ::if distribution!=null::
+ ::set basket = getBasket(m.userId,distribution._place.id,distribution.date)::
+
+ N°::basket.num::
+
+ ::end::
+
+ ::m.userName::
+ ::if m.userName2!=null::
+ ::_("alternated with"):: ::m.userName2::
+ ::end::
+
+ ::set name = m.userName ::
+ ::set name2 = m.userName2 ::
+ ::set totalAdh = totalAdh+1::
+ |
+ + + + + ::if distribution!=null:: + + + ::_("Edit"):: + + ::else:: + + + ::_("Edit"):: + + ::end:: + + + | + +||||||
| ::_("Prod. ID"):: | +::_("Qty"):: | +::_("Product"):: | +::_("U.P||price per unit"):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
|---|---|---|---|---|---|---|---|
| + $$nullSafe(::m.productRef::) + | ++ ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + | + ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + + ::formatNum(m.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | ++ ::if !m.canceled && m.quantity!=0:: + ::if m.paid==true:: + ::_("Paid"):: + ::else:: + ::_("Not paid"):: + ::end:: + ::end:: + + ::if(m.quantity==0):: + + ::if distribution==null:: + + + ::_("Delete"):: + + ::else:: + + + ::_("Delete"):: + + ::end:: + + ::end:: + + | + +
| ::_("Total"):: | +::formatNum(total):: ::currency():: | + ++ | |||||
|
+
+ ::set basket = getBasket(m.userId,place.id,date)::
+
+
+ ::_("Num"):: ::basket.num::
+
+
+ ::m.userName::
+ ::if m.userName2!=null::
+ ::_("alternately with"):: ::m.userName2::
+ ::end::
+ ::set contractTotal = 0::
+ |
+ ||||||||
| ::_("Contract"):: | +::_("Qty"):: | +::_("Ref"):: | +::_("Product"):: | +::_("U.P."):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
|---|---|---|---|---|---|---|---|---|
| + + ::short(m.contractName,40):: + + | ++ ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + | ++ $$nullSafe(::m.productRef::) + | ++ ::short(m.productName,40):: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + + ::formatNum(m.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + ::set subtotal = subtotal + m.total:: + ::set contractTotal = contractTotal + m.total:: + | ++ ::if m.paid==true:: + ::_("Paid"):: + ::else:: + ::_("Not paid"):: + ::end:: + | + +
| Total ::m.contractName:: | +::formatNum(contractTotal):: ::currency():: | ++ ::set contractTotal = 0:: + | ||||||
| ::_("Total member"):: | +::formatNum(subtotal):: ::currency():: | ++ ::set subtotal = 0:: + | ||||||
| ::_("Total of all orders:"):: | +::formatNum(total):: ::currency():: | ++ | ||||||
+ ::set date = hDate(distribution.date):: + ::raw __("Delivery of the ::date::",{date:date}):: +
+ ::end:: + ++ ::_("Be careful, if the price of the product was modified during the sale, every order of a member is taken into account with the price as it was at the time of the creation of the order"):: +
+ ::set total = 0:: +| ::_("Weight/Vol."):: | +::_("Quantities"):: | +::_("Product"):: | +::_("Reference"):: | +::_("Unit Price incl. VAT"):: | +::_("Total"):: | +
|---|---|---|---|---|---|
| + ::raw m.weightOrVolume:: + | ++ ::formatNum(m.quantity):: + | ++ ::m.pname:: + | ++ $$nullSafe(::m.ref::) + | ++ ::formatNum(m.priceTTC):: ::currency():: + | ++ ::formatNum(m.totalTTC):: ::currency():: + ::set total = total + m.totalTTC:: + | + + +
| Total | +::formatNum(total):: ::currency():: | +||||
|
+ ::if group._image!=null::
+ |
+
+ ::group.name::+ ::if distribution!=null:: +Livraison du ::hDate(distribution.date)::+ ::end:: +::c.name:: - ::c._vendor.name::+ |
+
+ ::set cv = c._vendor::
+ ::if cv._image!=null::
+ |
+
+ ::set cc = c._contact:: + ::set cv = c._vendor:: + Responsable contrat : ::cc.firstName:: ::cc.lastName::, ::cc.email::, + ::if cc.phone!=null :: ::cc.phone:: ::end:: +
++ Producteur : ::cv.name:: , + ::if cv.email!=null :: ::cv.email:: ::end::, + ::if cv.phone!=null :: ::cv.phone:: ::end:: +
+ ++
| ::_("Weight/Vol."):: | +::_("Quantities"):: | +::_("Product"):: | +::_("Reference"):: | +::_("Unit price incl. VAT"):: | +::_("Total"):: | +
|---|---|---|---|---|---|
| + ::raw m.weightOrVolume:: + | ++ ::formatNum(m.quantity):: + | ++ ::m.pname:: + | ++ $$nullSafe(::m.ref::) + | ++ ::formatNum(m.priceTTC):: ::currency():: + | ++ ::formatNum(m.totalTTC):: ::currency():: + ::set total = total + m.totalTTC:: + | +
| ::_("Total"):: | +::formatNum(total):: ::currency():: | +||||
::_("Push \"Control + P\" to print this page.")::
+ + diff --git a/lang/master/tpl/contractadmin/ordersByTimeFrame.mtt b/lang/master/tpl/contractadmin/ordersByTimeFrame.mtt new file mode 100644 index 0000000..c11cf68 --- /dev/null +++ b/lang/master/tpl/contractadmin/ordersByTimeFrame.mtt @@ -0,0 +1,146 @@ +::use 'design.mtt':: + +| + ::m.userName:: + ::if m.userName2!=null:: + en alternance avec ::m.userName2:: + ::end:: + ::set contractTotal = 0:: + | +||||||||
| ::_("Contract"):: | +::_("Qty"):: | +::_("Ref"):: | +::_("Product"):: | +::_("U.P."):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
|---|---|---|---|---|---|---|---|---|
| + + ::short(m.contractName,40):: + + | ++ ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + | ++ $$nullSafe(::m.productRef::) + | ++ ::short(m.productName,40):: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + + ::formatNum(m.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + ::set subtotal = subtotal + m.total:: + ::set contractTotal = contractTotal + m.total:: + | ++ ::if m.paid==true:: + ::_("Paid"):: + ::else:: + ::_("Not paid"):: + ::end:: + | + +
| Total ::m.contractName:: | +::formatNum(contractTotal):: ::currency():: | ++ ::set contractTotal = 0:: + | ||||||
| ::_("Total member"):: | +::formatNum(subtotal):: ::currency():: | ++ ::set subtotal = 0:: + | ||||||
| ::_("Total of all orders:"):: | +::formatNum(total):: ::currency():: | ++ | ||||||
+ $$insert(::_("New product")::,/product/insert/::c.id::) + ::_("Import from Excel/CSV"):: + + ::if !c._amap.hasTaxonomy():: + ::_("Categories"):: + ::end:: + +
++
+ + + + + +::end:: \ No newline at end of file diff --git a/lang/master/tpl/contractadmin/selectDistrib.mtt b/lang/master/tpl/contractadmin/selectDistrib.mtt new file mode 100644 index 0000000..29aff6e --- /dev/null +++ b/lang/master/tpl/contractadmin/selectDistrib.mtt @@ -0,0 +1,53 @@ +::use 'contractadmin/design.mtt':: + + ::if distributions.length>0:: + +| ::_("Date"):: | +::_("Location"):: | ++ |
|---|---|---|
| ::hDate(d.date):: | +::d._place.name:: | ++ + + ::_("Orders"):: + + + | +
| ::_("Number"):: | +::_("Year"):: | +
|---|---|
| ::a.cnt:: | +::a.uyear:: | +
| ::_("Quantity"):: | +::_("Product"):: | +::_("Total price"):: | +::_("% of orders"):: | +
|---|---|---|---|
| ::r.quantity:: | +::r.name:: | +::r.quantity*r.price:: ::currency():: | +::r.percent:: % | + +
| Total: ::totalQuantity:: ::_("products"):: | + +::totalPrice:: ::currency():: | ++ | |
|
+
+ |
+ $$nullSafe(::p.ref::) | +::p.name:: | +::p.stock:: | + ++ $$edit(modifier,/product/edit/::p.id::) + | + +
+
+ ::o.contract.name:: - ::o.contract._vendor.name::+ + |
+ ||||
|---|---|---|---|---|
| ::_("Quantities"):: | +::_("Product"):: | +::_("Reference"):: | +::_("Unit price incl. VAT"):: | +::_("Total"):: | +
| + ::m.quantity:: + | ++ ::m.pname:: + | ++ $$nullSafe(::m.ref::) + | ++ ::formatNum(m.priceTTC):: ::currency():: + | ++ ::formatNum(m.totalTTC):: ::currency():: + ::set total = total + m.totalTTC:: + | +
| Total | +::formatNum(total):: ::currency():: | +|||
+
+ ::o.contract.name:: - ::o.contract._vendor.name::+ |
+ |||||
|---|---|---|---|---|---|
| ::_("Quantities"):: | +::_("Product"):: | +::_("Reference"):: | +::_("Unit price incl. VAT"):: | +::_("Total HT"):: | +::_("Total TTC"):: | +
| + ::formatNum(m.quantity):: + | ++ ::m.pname:: + | ++ $$nullSafe(::m.ref::) + | ++ ::formatNum(m.priceTTC):: ::currency():: + | ++ ::formatNum(m.totalHT):: ::currency():: + | ++ ::formatNum(m.totalTTC):: ::currency():: + | + ::set total = total + m.totalTTC:: +
| ::_("Total"):: | +::formatNum(total):: ::currency():: | +||||
| + ::_("Contract type"):: + | ++ ::if contract.type==0:: + ::_("CSA Contract"):: + ::else:: + ::_("Variable order contract"):: + ::end:: + | +
| ::_("Start date"):: | +::hDate(contract.startDate):: | +
| ::_("End date"):: | +::hDate(contract.endDate):: | +
| ::_("Name"):: | +::contract._vendor.name:: | +
| ::_("Email"):: | +$$nullSafe(::contract._vendor.email::) | +
| ::_("Phone"):: | +$$nullSafe(::contract._vendor.phone::) | +
| ::p.getName():: | +::formatNum(p.price):: ::currency():: | +
+ Type : Gratuit jusqu'à 20 foyers ( actuellement 1 foyers dans votre groupe) +
++ +
+ +Ici se trouve la liste des contrats.
+ Ils comportent une date de début, une date de fin, et représentent votre relation avec un producteur.
+
+ C'est ici que vous pourrez gérer : +
++
N'oubliez pas de vous inscrire pour aider lors des livraisons
+ ++ Attention, vous n'avez défini aucun mot de passe pour votre compte ! +
+ Définir un mot de passe + +
+
+ 
+
+ + ::_("Place"):: : + ::distrib._place.toString()::, ::distrib._place.getAddress():: +
++ ::set c = contract._contact:: + ::set v = contract._vendor:: + ::_("Contact in charge of the contract") : ::c.firstName:: ::c.lastName::, ::c.email::, ::c.phone:: +
++ ::_("Farmer"):: : + ::v.name:: , + ::if v.email!=null :: ::v.email:: ::end::, + ::if v.phone!=null :: ::v.phone:: ::end:: +
++ ::_("Members on duty"):: : + ::if distrib._distributor1!=null:: ::distrib._distributor1.getName()::, ::end:: + ::if distrib._distributor2!=null:: ::distrib._distributor2.getName()::, ::end:: + ::if distrib._distributor3!=null:: ::distrib._distributor3.getName()::, ::end:: + ::if distrib._distributor4!=null:: ::distrib._distributor4.getName():: ::end:: +
+ +::raw nl2br(distrib._contract._amap.txtDistrib)::
+ +| + + ::set basket = getBasket(m.userId,distrib._place.id,distrib.date):: + N°::basket.num:: - + + ::m.userName:: + + + ::set u = getUser(m.userId):: + + ::if u !=null && u.phone!=null:: + - Tél. $$nullSafe(::u.phone::) + ::end:: + + ::if m.userName2 != null:: + ::_("alternately with"):: + + ::m.userName2:: + + + ::set u = getUser(m.userId2): + ::if u !=null:: + - Tél. $$nullSafe(::u.phone::) + ::end:: + ::end:: + | +|||||||
| ::_("Qty"):: | +::_("Ref"):: | +::_("Product"):: | +::_("U.P."):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Signature"):: | +
|---|---|---|---|---|---|---|---|
| + ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + | ++ $$nullSafe(::m.productRef::) + | ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + ::formatNum(m.fees):: ::currency():: + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + ::set subtotal = subtotal + m.total:: + | ++ | +
| + | ::_("TOTAL"):: | +::formatNum(subtotal):: ::currency():: | ++ ::set subtotal = 0:: + | ||||
| ::_("Total order:"):: | +::formatNum(total):: ::currency():: | ++ | |||||
::_("Push on \"Control + P\" to print this page.")::
+ + diff --git a/lang/master/tpl/distribution/listByDate.mtt b/lang/master/tpl/distribution/listByDate.mtt new file mode 100644 index 0000000..153e327 --- /dev/null +++ b/lang/master/tpl/distribution/listByDate.mtt @@ -0,0 +1,252 @@ + + + + +| ::_("Name"):: | +::_("Contact details"):: | +::_("Qty"):: | +::_("Product"):: | +::_("U.P."):: | +::_("Fees"):: | +::_("Total"):: | +::_("Signature"):: | +||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ ::if m.userName != name || m.userName2 != name2::
+
+ ::set basket = getBasket(m.userId,place.id,date)::
+ ::_("Num"):: ::basket.num:: -
+
+ ::m.userName::
+ ::if m.userName2 != null::
+ ::_("alternately with"):: ::m.userName2:: + ::end:: + ::set total = 0:: + ::set productNum = 0:: + ::end:: + |
+
+ ::if m.userName != name || m.userName2 != name2::
+ ::set u = getUser(m.userId):
+ ::if u !=null::
+ $$nullSafe(::u.phone::)
+ ::end::
+
+ ::if m.userName2 != null::
+ ::set u = getUser(m.userId2):
+ ::if u !=null::
+ $$nullSafe(::u.phone::) + ::end:: + ::end:: + ::end:: + + |
+ ::set name = m.userName ::
+ ::set name2 = m.userName2 ::
+ + ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + + ::set productNum = productNum+m.quantity:: + | ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::if m.fees!=null:: + ::formatNum(m.fees):: ::currency():: + ::end:: + | ++ ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | + ++ | ||||||||||||||||||
| + | + | ::formatNum(productNum):: | ++ | ::_("TOTAL"):: | +::formatNum(total):: ::currency():: | ++ | |||||||||||||||||||
| + | ::_("Payment:"):: | +
+
|
+
+ ::else::
+
+ + ::set ua = u.getUserAmap(user._amap):: + ::set balance = ua.balance:: + | ::_("Balance of the member:"):: ::ua.balance:: ::currency():: | +
+ ::set pending = 0::
+
+
|
+ ::end::
+
+
+ ||||||||||||||||||||
::raw nl2br(user.getAmap().txtDistrib)::
+ ++ ::_("Push on \"Control + P\" to print this page."):: +
+ + + +| ::r.t::ms | +::r.length:: | +Exp | +Stack | +::r.sql:: | +
| + + + ::set basket = getBasket(m.userId,place.id,date):: + ::_("Num"):: ::basket.num:: - + ::m.userName:: + + ::set total = 0:: + ::set productNum = 0:: + | ++ ::set u = getUser(m.userId): + ::if u!=null && u.phone!=null:: + Tél: $$nullSafe(::u.phone::) + ::end:: + | ++ ::user._amap.name:: + | +
|
+ ::if m.userName2 != null::
+ ::_("alternately with"):: + ::m.userName2:: + ::set total = 0:: + ::set productNum = 0:: + ::end:: + |
+ + ::if m.userName2 != null:: + ::set u = getUser(m.userId2): + ::if u !=null:: + $$nullSafe(::u.phone::) + ::end:: + ::end:: + | ++ ::_("Delivery of the"):: ::hDate(date):: + | +
| + ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + ::set productNum = productNum+m.quantity:: + | ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::if m.fees!=null:: + ::formatNum(m.fees):: ::currency():: + ::end:: + | ++ ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | + ++ + | |
| ::formatNum(productNum):: | ++ | ::_("TOTAL"):: | +::formatNum(total):: ::currency():: | ++ | ||
| ::r.t::ms | +::r.length:: | +Exp | +Stack | +::r.sql:: | +
| + + ::set basket = getBasket(m.userId,place.id,date):: + N°::basket.num:: - + ::m.userName:: + + ::set total = 0:: + ::set productNum = 0:: + | ++ ::set u = getUser(m.userId): + ::if u!=null && u.phone!=null:: + Tél: $$nullSafe(::u.phone::) + ::end:: + | ++ ::user._amap.name:: + | +
|
+ ::if m.userName2 != null::
+ ::_("alternately with"):: + ::m.userName2:: + ::set total = 0:: + ::set productNum = 0:: + ::end:: + |
+ + ::if m.userName2 != null:: + ::set u = getUser(m.userId2): + ::if u !=null:: + $$nullSafe(::u.phone::) + ::end:: + ::end:: + | ++ ::_("Delivery of the"):: ::hDate(date):: + | +
| + ::short(m.contractName,40):: + | + ::set currentContract = short(m.contractName,40):: + ::else:: ++ ::end:: + | + ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + ::set productNum = productNum+m.quantity:: + | ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::if m.fees!=null:: + ::formatNum(m.fees):: ::currency():: + ::end:: + | ++ ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | + ++ + | ||||||||||||||||||||||
| + | ::formatNum(productNum):: | ++ | ::_("TOTAL"):: | +::formatNum(total):: ::currency():: | ++ | ||||||||||||||||||||||||
| ::r.t::ms | +::r.length:: | +Exp | +Stack | +::r.sql:: | +
| ::_("Name"):: | +::_("Contact details"):: | +::_("Qty"):: | +::_("Product"):: | +::_("Signature"):: | + +
|---|---|---|---|---|
|
+ ::if m.userName != name || m.userName2 != name2::
+
+ ::set basket = getBasket(m.userId,place.id,date)::
+ N°::basket.num:: -
+
+ ::m.userName::
+
+ ::if m.userName2 != null::
+ ::_("alternately with"):: ::m.userName2:: + ::end:: + ::set total = 0:: + ::set productNum = 0:: + ::end:: + + |
+
+ ::if m.userName != name || m.userName2 != name2::
+ ::set u = getUser(m.userId):
+ ::if u !=null::
+ $$nullSafe(::u.phone::)
+ ::end::
+
+ ::if m.userName2 != null::
+ ::set u = getUser(m.userId2):
+ ::if u !=null::
+ $$nullSafe(::u.phone::) + ::end:: + ::end:: + ::end:: + + |
+ ::set name = m.userName ::
+ ::set name2 = m.userName2 ::
+ + ::if(m.quantity==0 && m.canceled):: + ::_("Canceled"):: + ::else:: + ::raw m.smartQt:: + ::end:: + ::set productNum = productNum+m.quantity:: + | ++ ::m.productName:: + | + ++ |
::raw nl2br(user.getAmap().txtDistrib)::
+ ++ ::_("Push on \"Control + P\" to print this page."):: +
+ + + +| ::r.t::ms | +::r.length:: | +Exp | +Stack | +::r.sql:: | +
+ ::_("Place"):: : + ::distrib._place.toString()::, ::distrib._place.getAddress():: +
++ ::set c = contract._contact:: + ::set v = contract._vendor:: + ::_("Contact in charge of the contract") : ::c.firstName:: ::c.lastName::, ::c.email::, ::c.phone:: +
++ ::_("Farmer"):: : + ::v.name:: , + ::if v.email!=null :: ::v.email:: ::end::, + ::if v.phone!=null :: ::v.phone:: ::end:: +
++ ::_("Members on duty"):: : + ::if distrib._distributor1!=null:: ::distrib._distributor1.getName()::, ::end:: + ::if distrib._distributor2!=null:: ::distrib._distributor2.getName()::, ::end:: + ::if distrib._distributor3!=null:: ::distrib._distributor3.getName()::, ::end:: + ::if distrib._distributor4!=null:: ::distrib._distributor4.getName():: ::end:: +
+ +| + ::foreach p products:: + |
+ ::p.name:: + ::p.ref:: + |
+ ::end::
+ TOTAL | +
|---|---|---|
| + ::set basket = getBasket(user.id,distrib._place.id,distrib.date):: + N°::basket.num:: - + + ::user.getCoupleName():: + + | + ::foreach p products:: ++ ::set o = orders.get(user.id).get(p.id):: + + ::if(o!=null):: + ::raw o.smartQt:: + ::end:: + | + ::end:: +::formatNum(totalByUser(user.id)):: ::currency():: | +
| TOTAL | + ::foreach p products:: ++ ::set q = totalByProduct(p.id):: + ::if(p.qt!=null && (p.hasFloatQt || p.variablePrice) ):: + ::q * p.qt:: ::unit(p._unitType,false):: + ::else:: + ::q:: + ::end:: + | + ::end:: +
::raw nl2br(distrib._contract._amap.txtDistrib)::
+::_("Push on \"Control + P\" to print this page.")::
+ + + diff --git a/lang/master/tpl/distribution/planning.mtt b/lang/master/tpl/distribution/planning.mtt new file mode 100644 index 0000000..cc39240 --- /dev/null +++ b/lang/master/tpl/distribution/planning.mtt @@ -0,0 +1,110 @@ +::use 'design.mtt':: ++ ::raw _("Subscribe now by selecting checkboxes corresponding to dates which are convenient for you. The goal of attendances consists in helping during the delivery of products."):: +
+ +| + ::foreach d distribs:: + ::set date = getDate(d.date):: + | ::date.dow:: + ::date.d:: + ::date.m:: + ::date.h+":"+date.i:: |
+ ::end::
+
|---|---|
| + ::user.getCoupleName():: + | + + + ::set me = doodle.get(user.id):: + ::foreach d distribs:: +
+
+ ::if me !=null::
+ ::set a = me.planning.get(d.id)::
+ ::if a!=null::
+ 
+ ::else::
+ ::if !d.hasEnoughDistributors()::
+ 
+ ::else::
+ ::_("full")::
+ ::end::
+ ::end::
+ ::else::
+ ::if !d.hasEnoughDistributors()::
+
+ ::else::
+ ::_("full")::
+ ::end::
+
+ ::end::
+
+ |
+ ::end::
+
+
+
| ::doo.user.getCoupleName():: | + + ::foreach d distribs:: +
+ ::set a = doo.planning.get(d.id)::
+
+ ::if a!=null::
+ 
+ ::end::
+ |
+ ::end::
+
+ ::if(confirmed):: +
+ + ::_("Back to the summary sheet of orders"):: +
+ + +|
+
+ ::_("Num"):: ::basket.num::
+
+ |
+ + ::u.getCoupleName():: + | + ++ + ::if(class=="danger"):: + + + ::_("To be validated"):: + + ::else:: + + + ::_("Validated"):: + + ::end:: + | +
+ ::_("An error occurred."):: +
+
+ ::_("If the website is unavailable, please try again in few minutes.")::
+
+ ::_("If this happen repeatedly, please let us know so we can solve the issue.")::
+
::message::+ + ::if stack:: +
::stack::+ ::end:: +
+ ::raw text:: +
+ + ::raw form:: + +
+
+ ::if group._image!=null::
+
+ ::if group.extUrl!=null && group.extUrl!=""::
+
+ ::else::
+
+ ::end::
+
+ ::end::
+
+ + ::if isMember:: + + + + ::_("Go to my account"):: + + + ::else:: + +
+ ::_("Contact the person in charge in order to subscribe to this group and get to know membership conditions."):: +
++ + + ::_("Membership request"):: + +
+ ::case:: ++ ::_("This group accepts subscriptions on waiting list. A coordinator will contact you."):: +
++ + + ::_("Subscription on waiting list"):: + +
+ + ::case:: ++ + + ::_("Free subscription"):: + +
+ ::case:: ++ ::_("This group is full and do not accept any more subscription."):: +
+ ::end:: + + ::end:: + + + + + ::if user==null:: ++ ::if group.txtIntro!=null && group.txtIntro!="":: + ::raw nl2br(group.txtIntro):: + ::end:: +
+ + ++
+
+
+ ::_("Non-complete extract of available products:"):: +
+ + ::foreach c contracts:: +
+ ::c.name::
+ ::c._vendor.name::, $$nullSafe(::c._vendor.zipCode::) $$nullSafe(::c._vendor.city::)
+
+ ::raw _("Congratulations, you just created a new group !
As an example, we created a fake farmer and fake products.
It will show you how things work together in Cagette.net.
Of course, you'll be able to delete them.")::
+
+ ::raw _("As a starter, we recommand you to follow the guided tour to discover step by step the main sections of the software."):: +
+ + +| + + | +
+ 1:: >::raw c.smartQt::
+
+ ::_("Canceled")::
+
+ ::c.productName::
+
+ ::if c.userId2!=null::
+ ::if user.id==c.userId::
+ ::set you = c.userName::
+ ::set mate = c.userName2::
+ ::else::
+ ::set mate = c.userName::
+ ::set you = c.userName2::
+ ::end::
+
+ ( + + ::raw __("alternated with ::mate::",{mate:mate})::, + + ::if getWhosTurn(c.id,dist)==false:: + + ::if c.userName == you:: + ::_("It's your turn"):: + ::else:: + ::_("It's his/her turn"):: + ::end:: + ::else:: + ::if c.userName2 == you:: + ::_("It's your turn"):: + ::else:: + ::_("It's his/her turn"):: + ::end:: + ::end:: + ) + ::end:: + |
+
::_("Don't forget to register for permanences")::
++ ::_("Warning, you don't have defined a password yet !"):: +
+ ::_("Set my password"):: + +::raw b.html::
+| + ::s.parameter:: + | ++ $$bool(::s.valid::) + | ++ ::s.message:: + | ++ ::if !s.valid:: + ::_("Update"):: + ::end:: + | + +
|---|
+ ::else::
+
+ ::end::
+ 
+ | + ::if d.orderStartDate!=null:: + ::if now.getTime() > d.orderStartDate.getTime() && now.getTime() < d.orderEndDate.getTime():: + + + ::elseif now.getTime() > d.orderEndDate.getTime():: + + + ::else:: + + + ::end:: + ::else:: + + + ::end:: + + ::set c = getCatalog(d):: + ::c.name:: + | ++ ::if showBtns:: + + ::end:: + | +
+ ::_("Hello"):: ::user.firstName::, +
++ ::_("You asked to modify your password,"):: + ::_("Click here to perform this operation")::. +
++ ::_("Be careful, this link is valid only 24 hours for security reasons."):: +
+ +::end:: + + diff --git a/lang/master/tpl/mail/invitation.mtt b/lang/master/tpl/mail/invitation.mtt new file mode 100644 index 0000000..d6b4f32 --- /dev/null +++ b/lang/master/tpl/mail/invitation.mtt @@ -0,0 +1,45 @@ +:: use 'mail/design.mtt':: + +
+
+ + ::_("Hello"):: $$nullSafe(::name::), +
+ +
+ ::if groupName!=null::
+
+ ::raw __("As a member of ::groupName::",{groupName:groupName})::
+
+ ::_("you have been pre-registered on Cagette.net")::
+
+ ::else::
+
+ ::_("you have been pre-registered on Cagette.net")::
+
+ ::end::
+
+ ::_("This software makes the organisation of the group easy by informing you about the next delivery dates, orders and current contracts"):: +
++ ::_("In order to finalize the subscription, please choose your password"):: +
++ ::_("You will then be able to connect anytime by using your e-mail"):: + ( ::email:: ::if email2!=null:: ou ::email2:: ::end:: ) + ::_("and your password on the website"):: ::HOST:: + + + » ::_("Finalize your subscription"):: + + +
+ ++ ::_("Hello"):: ::user.firstName::, +
+
+ ::__("A new password has been defined for ::site::",{site:NAME})::
+
+ ::raw __("The new password is ::pass::, don't forget it !",{pass:password})::
+
+ ::raw __("You can use the following emails to log into your account : ::emails::",{emails:emails}):: +
+ +::end:: + + diff --git a/lang/master/tpl/mail/orderSummaryForMember.mtt b/lang/master/tpl/mail/orderSummaryForMember.mtt new file mode 100644 index 0000000..e871a00 --- /dev/null +++ b/lang/master/tpl/mail/orderSummaryForMember.mtt @@ -0,0 +1,74 @@ +::use 'mail/design.mtt':: + +| + Date de livraison + | ++ ::dDate(distribution.date):: de ::hHour(distribution.date):: à ::hHour(distribution.end):: + | +
| Adresse | ++ ::distribution._place.getFullAddress():: + | +
| Qté | +Produit | +P.U | +Sous-total | +Frais | +Total | +
|---|---|---|---|---|---|
| + ::raw m.smartQt: + | ++ ::m.productName:: + | ++ ::formatNum(m.productPrice):: ::currency():: + | ++ ::formatNum(m.subTotal):: ::currency():: + | ++ + ::if m.percentageValue!=null:: + + ::formatNum(m.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(m.total):: ::currency():: + ::set total = total + m.total:: + | + +
| + | Total : | +::formatNum(total):: ::currency():: | +|||
+ Les commandes du contrat ::contract.name:: dont vous êtes coordinateur ont fermé le ::hDate(distribution.orderEndDate)::. +
+ +| + Date de livraison + | ++ ::dDate(distribution.date):: de ::hHour(distribution.date):: à ::hHour(distribution.end):: + | +
| Adresse | ++ ::distribution._place.getFullAddress():: + | +
| Poids/Vol. | +Quantités | +Produit | +Référence | +Prix unitaire TTC | +Total | +
|---|---|---|---|---|---|
| ::raw m.weightOrVolume:: | ++ ::raw m.quantity:: + | ++ ::m.pname:: + | ++ $$nullSafe(::m.ref::) + | ++ ::formatNum(m.priceTTC):: ::currency():: + | ++ ::formatNum(m.totalTTC):: ::currency():: + ::set total = total + m.totalTTC:: + | +
| + | Total : | +::formatNum(total):: ::currency():: | +|||
+ Le site est actuellement en maintenance.
+ Revenez dans quelques instants.
+
+ The website is currently under maintenance.
+ Please come back later.
+
| + ::ua._user.getName():: + | ++ ::ua.balance:: ::currency():: + | +
| + ::ua._user.getName():: + | ++ ::ua.balance:: ::currency():: + | +
| + ::ua._user.getName():: + | ++ ::ua.balance:: ::currency():: + | +
::members.current().length:: ::_("members")::.
+ + ::_("Back to main page"):: + ::elseif search!=null:: ++ ::_("You can invite by email all the members who never logged in, in one single clic."):: +
+ + ::end:: + +| + + ::m.lastName:: ::m.firstName:: + ::if m.lastName2!=null:: + & ::m.lastName2:: ::m.firstName2:: + ::end:: + + | ++ ::if m.address1!=null:: + ::m.address1:: + ::end:: + ::if m.address2!=null:: + ::m.address2:: + ::end:: + ::if m.zipCode!=null:: + ::m.zipCode:: + ::end:: + ::if m.city!=null:: + ::m.city:: + ::end:: + | +
| + + + | +|
+ ::raw __("There is ::waitingList:: people on waiting list.",{waitingList:waitingList})::
+
+ ::_("Display the list")::
+
| ::_("First name"):: | +::_("Last name"):: | +::_("Email"):: | +::_("Phone"):: | +::_("Partner first name"):: | +::_("Partner last name"):: | +::_("Partner email"):: | +::_("phone"):: | +::_("Address 1"):: | +::_("Address 2"):: | +::_("zip code"):: | +::_("City"):: | +
|---|---|---|---|---|---|---|---|---|---|---|---|
| + ::if r!=null:: ::r:: ::end:: + | + ::end:: +
| ::_("First name"):: | +::_("Last name"):: | +::_("Email"):: | +::_("Phone"):: | +::_("Partner first name"):: | +::_("Partner last name"):: | +::_("Partner email"):: | +::_("phone"):: | +::_("Address 1"):: | +::_("Address 2"):: | +::_("zip code"):: | +::_("City"):: | +
|---|---|---|---|---|---|---|---|---|---|---|---|
| + ::if r!=null:: ::r:: ::end:: + | + ::end:: +
::_("Before validating this import, please check that this table est correctly filled.
If some datas are shifted or are not linked to the right column, please check your CSV file.")::
+
::_("It looks like there is no data to import. Please check your CSV file or check that the users you want to import are not already registred.")::
+ ::_("Try again"):: ++ ::raw _("You may now consider inviting them to log into Cagette.net"):: +
+ ::else:: +::_("You did'nt import anything in your database because your file was empty, or contained already registred users")::
+ ::end:: + ::_("Go back to the main page"):: + + + ::end:: + +| ::_("Date"):: | +::_("Subject"):: | +::_("Status"):: | +
|---|---|---|
| ::hDate(m.date):: | +::m.subject:: | ++ ::if m.failure!=null:: + ::m.failure:: + ::else:: + ::m.success:: + ::end:: + | +
| + | ::_("Balance"):: : | + ::if balance<0:: + ::set color = "C00":: + ::else:: + ::set color = "0C0":: + ::end:: ++ ::if balance<0:: + - + ::end:: + | ++ ::Math.abs(balance):: ::currency():: + | ++ | +||
|
+ ::if t.type==2::
+
+ $$edit(::_("Edit")::,/transaction/edit/::t.id::)
+ $$delete(::_("Del.")::,/transaction/delete/::t.id::?token=::token::)
+
+ ::elseif isAdmin::
+
+
+
+ ::end::
+
+ |
+ ||||||
| + + | +||||||
|---|---|---|---|---|---|---|
+ ::_("Last login"):: :
+ ::if member.ldate!=null::
+ ::member.ldate.toString()::
+ ::else::
+ ::_("This member never logged in")::
+ ::end::
+
+ ::_("Registred since"):: :
+ ::if member.cdate!=null::
+ ::member.cdate.toString()::
+ ::else::
+ ???
+ ::end::
+
+ ::if member.pass==""::
+
+ $$edit(::_("Edit")::,/member/edit/::member.id::) + $$delete(::_("Remove from group")::,/member/delete/::member.id::?token=::token::) + ::_("Put on waiting list"):: + + + + ::_("Received messages"):: + + ::if !member.isFullyRegistred():: + + + ::_("Send an invitation"):: + ::end:: +
+ + +| ::_("Qty||short version for quantity"):: | +::_("Product"):: | +::_("Price"):: | +::_("Contract"):: | +
|---|---|---|---|
| ::raw p.smartQt:: | +::p.productName::
+
+ ::if p.userId2 != null::
+ ::_("Order alternated with"):: + ::if member.id == p.userId:: + ::p.userName2:: + ::else:: + ::p.userName:: + ::end:: + ::end:: + + |
+ ::p.subTotal:: ::currency():: | ++ ::p.contractName:: + | +
| ::_("Qty||short version for quantity"):: | +::_("Product"):: | +::_("U.P||short version of unit price"):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Contract"):: | + +
|---|---|---|---|---|---|---|
| ::raw p.smartQt:: | +::p.productName:: | +::p.productPrice:: ::currency():: | +::p.subTotal:: ::currency():: | ++ + ::if p.percentageValue!=null:: + + ::formatNum(p.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(p.total):: ::currency():: + ::set total = total + p.total:: + + | ++ ::p.contractName:: + | + +
| + | ::_("TOTAL"):: | +::formatNum(total):: ::currency():: | +||||
| ::_("Name"):: | +::_("Email"):: | +::_("Phone"):: | +::_("Registration date"):: | +::_("Message"):: | ++ |
|---|---|---|---|---|---|
| ::u.getName():: | +::u.email:: | +$$nullSafe(::u.phone::) | +::hDate(w.date):: | +"::w.message::" | ++ + + ::_("Accept membership request"):: + + + + + ::_("Deny request"):: + | +
| ::_("Period"):: | +::_("Subscription payment date"):: | +Actions | +
|---|---|---|
| ::user._amap.getPeriodNameFromYear(m.year):: | +::hDate(m.date):: | ++ $$delete(::_("Delete")::,/membership/delete/::member.id::/::m.year::?token=::token::) + | +
| ::_("Subject:"):: | +::msg.title:: | +||||
| ::_("Sent on the"):: | +::hDate(msg.date):: | +||||
| ::_("Sender"):: | ++ ::if msg._sender==null:: + inconnu + ::else:: + ::msg._sender.firstName:: ::msg._sender.lastName:: + ::end:: + | +||||
| ::_("Receiver(s)"):: | ++ ::if list!=null:: + ::list:: + ::else:: + ::msg._recipients:: + ::end:: + | +||||
| ::_("Status"):: | +
+
+
+
|
+ ||||
| + | ::raw msg.body:: | +
+ ::raw _("You can link your products to categories, in order to better organize them in the \"shop mode\".
To add categories: select checkboxes of products and then select a category in the list at the bottom of the page. Click then on \"add\".
To remove a category: click on it.")::
+
| ::_(h):: | + ::end:: +
|---|
| + ::if r!=null:: ::r:: ::end:: + | + ::end:: +
+ ::raw _("Before validating the import, please check if the table above is correctly filled.
If data are not in line or not corresponding to the right column, it means that your CSV file is not correct.")::
+
::_("It seems that there is no data to import.")::
+ Recommencer +::_("You did not import anything in your database because your file was empty or contained products already present in the database.")::
+ ::end:: + ::_("Back to the management of products"):: + + + ::end:: +
+ ::raw b.html::
+
+ 
::_("Organic agriculture")::
+
+ 
::_("Variable price depending on weight")::
+
+ ::raw p.desc:: +
+ ++ ::raw nl2br(vendor.desc):: +
+ + ::if vendor.linkUrl!=null:: ++ ::if vendor.linkText!=null:: + ::vendor.linkText:: + ::else:: + ::_("Read more"):: + ::end:: +
+ ::end:: + ++ ::_("You chose to pay by cash at the product distribution"):: : +
+ ++ ::_("Please prepare the following amount for the distribution :"):: : ::formatNum(amount):: ::currency():: +
+ + + ++ ::_("You chose to pay by check at the product distribution"):: : +
+ + ++ ::raw __("Prepare a check of ::amount:: ::currency:: payable to : ::checkOrder::",{checkOrder:user._amap.checkOrder,amount:formatNum(amount),currency:currency()}):: +
+
+ ::_("Mention this reference at the back of the check in order to facilitate its process:")::
+ ::code::
+
+ + + ::_("Check my orders"):: + +
+ ++ ::_("You chose to pay with your money pot."):: : +
+ ++ ::_("Please remember to clear your balance at the time agreed with the coordinator of your group."):: +
+ ++ ::__("Your current balance is : ::balance:: ::currency::",{balance: balance,currency: currency() }):: +
+ ++ + ::_("Check my orders"):: + + + ::_("Check my payments history"):: +
+ ++ ::_("Amount to pay"):: : ::formatNum(amount):: ::currency():: +
++ ::_("Your basket has been recorded, please select a payment method to confirm it."):: +
++ ::_("You chose to pay by transfer"):: : +
+
+ ::_("Please make a transfer of")::
+ ::formatNum(amount):: ::currency()::
+
+ ::_("to the following bank account:")::
+ ::_("IBAN:"):: ::user._amap.IBAN::
+
+ ::_("Mention this reference in the label of the transfer in order to facilitate its process:")::
+ ::code::
+
| Operation ID | +::op.id:: | +||||||||||||||||||||||||||||
| Name | +::op.name:: | +||||||||||||||||||||||||||||
| Data | +::op._data:: | +||||||||||||||||||||||||||||
| Infos | +
+
+ ::if infos!=null::
+ ::foreach h infos.HPAY::
+
|
+
::raw _("Connect to your Cagette Pro account to manage your products, catalogs and deliveries.")::
+::raw _("Please click on the Cagette group you want to connect to.")::
++ ::_("You don't belong to any group yet"):: +
+ ::_("Create my own group"):: +| + ::w._group.name:: + | ++ ::__("Request sent on ::date::",{ date:hDate(w.date) }):: + | ++ ::_("Cancel"):: + | +
+ ::_("If you have forgotten your password or if you would like to change it, please key-in below your e-mail address:"):: + + ::raw form:: +
+ ::elseif step==2:: ++ ::_("An e-mail was sent to you to allow you changing your password."):: +
+ ::elseif step==3:: ++ ::_("Key-in your new password:"):: + + ::raw form:: +
+ ::else:: ++ ::_("Congratulations, your password have been modified!"):: +
+ + + ::end:: + +::end:: + + diff --git a/lang/master/tpl/user/forgottenPassword.mtt b/lang/master/tpl/user/forgottenPassword.mtt new file mode 100644 index 0000000..5098f00 --- /dev/null +++ b/lang/master/tpl/user/forgottenPassword.mtt @@ -0,0 +1,42 @@ +:: use 'design.mtt':: ++ ::_("If you have forgotten your password or if you would like to change it, please key-in below your e-mail address:"):: + + ::raw form:: +
+ ::elseif step==2:: ++ ::_("Key-in your new password:"):: + + ::raw form:: +
+ ::else:: +0:: > + ::_("These persons are already in the database, but are not member of this group:"):: +
::foreach u userSims::
+ ::u::
+ ::end::
+
0:: > + ::_("These persons are already member of this group:"):: +
+ ::foreach u userAmaps::
+ ::u::
+ ::end::
+
| Commande | +||||||||
|---|---|---|---|---|---|---|---|---|
|
+
+
+ N°::basket.num::
+
+
+ ::member.getName()::
+ |
+ ||||||||
| ::_("Contract"):: | +::_("Qty"):: | +::_("Ref"):: | +::_("Product"):: | +::_("U.P."):: | +::_("Sub-total"):: | +::_("Fees"):: | +::_("Total"):: | +::_("Paid"):: | +
| + + ::short(o.contractName,40):: + + | ++ ::raw o.smartQt: + | ++ $$nullSafe(::o.productRef::) + | ++ ::short(o.productName,40):: + | ++ ::formatNum(o.productPrice):: ::currency():: + | ++ ::formatNum(o.subTotal):: ::currency():: + | ++ + ::if o.percentageValue!=null:: + + ::formatNum(o.fees):: ::currency():: + + ::end:: + | ++ + ::formatNum(o.total):: ::currency():: + ::set total = total + o.total:: + + | ++ $$check(::o.paid::) + | + +
| ::_("Total ordered"):: | +::formatNum(total):: ::currency():: | ++ + | ||||||
| ::_("Payment"):: | +||||||||
|---|---|---|---|---|---|---|---|---|
| + | ||||||||
| + ::if(tt.pending):: + + + ::_("This payment was received"):: + + $$delete(::_("Del.")::,/validate/::date::/::place.id::/::member.id::/deleteOp/::tt.id::?token=::token::) + ::end:: + | +||||||||
| + | ::_("Total paid"):: | ++ ::tpaid:: ::currency():: + | ++ + | +|||||
|
+
+ ::_("This order has been made when payments were disabled")::
+
+ | ||||||||
+ $$insert(::_("Key-in a refund")::,/validate/::date::/::place.id::/::member.id::/addRefund/) + $$insert(::_("Key-in a payment")::,/validate/::date::/::place.id::/::member.id::/addPayment/) +
+ ++ + + + ::_("Validate this order"):: + + +
+ + ::else:: + + + +| + Solde de l'adhérent ::_("Details"):: + | +||||||||
|---|---|---|---|---|---|---|---|---|
| + ::if(op.pending && op.type==2):: + + + ::_("This payment has been received"):: + + $$delete(Suppr.,/validate/::date::/::place.id::/::member.id::/deleteOp/::op.id::?token=::token::) + ::end:: + | +||||||||
| + | Solde : | + ::if balance<0:: + ::set color = "C00":: + ::else:: + ::set color = "0C0":: + ::end:: ++ ::balance:: ::currency():: + | ++ | |||||
+ $$insert(::_("Key-in a refund")::,/validate/::date::/::place.id::/::member.id::/addRefund/) + $$insert(::_("Key-in a payment")::,/validate/::date::/::place.id::/::member.id::/addPayment/) +
+ ++ ::if(balance < 0):: + + + ::_("Validate this order"):: + + +
+ + ::_("Back to the delivery validation"):: + + ::_("Payment history of this member"):: +
+ +| + + ::m.name:: + + | ++ + | +
| + << + + page ::vendors.page::/::vendors.pages:: + + >> + | +|
|---|---|
"+e.error + " at URL " + e.url + " ( user : " + (e.user!=null?e.user.toString():"none") + ", IP : " + e.ip + ")
This step is important in order to:
"); + explain += t._("Your distribution just finished, don't forget to validate it
"); + html += explain; + html += t._("Click here to validate the distribution (You must be connected to your group Cagette)", {distriburl:url}); + + App.quickMail(d.contract.amap.contact.email, subj, html); + } + + /* + * warn administrator if a distribution ended 3 days ago + */ + + var from = now.setHourMinute( now.getHours() , 0 ).deltaDays(-3); + var to = now.setHourMinute( now.getHours()+1 , 0).deltaDays(-3); + + //warn administrator if a distribution just ended + var ds = db.Distribution.manager.search( !$validated && ($end >= from) && ($end < to) , false); + + for ( d in Lambda.array(ds)){ + if ( d.contract.type != db.Contract.TYPE_VARORDER ){ + ds.remove(d); + }else if ( !d.contract.amap.hasPayments() ){ + ds.remove(d); + } + } + + var ds = tools.ObjectListTool.deduplicateDistribsByKey(ds); + + for ( d in ds ){ + // var subj = d.contract.amap.name + t._(": Validation of the delivery of the ") + App.current.view.hDate(d.date); + var subj = t._("[::group::] Validation of the ::date:: distribution",{group : d.contract.amap.name , date : view.hDate(d.date)}); + + var url = "http://" + App.config.HOST + "/distribution/validate/"+d.date.toString().substr(0,10)+"/"+d.place.id; + + var html = t._("
Reminder: you have a delivery to validate.
"); + html += explain; + html += t._("Click here to validate the delivery (You must be connected to your Cagette group)", {distriburl:url}); + + App.quickMail(d.contract.amap.contact.email, subj, html); + } + + + /* + * Autovalidate unvalidated distributions after 10 days + */ + var from = now.setHourMinute( now.getHours() , 0 ).deltaDays( 0 - db.Distribution.DISTRIBUTION_VALIDATION_LIMIT ); + var to = now.setHourMinute( now.getHours() + 1 , 0).deltaDays( 0 - db.Distribution.DISTRIBUTION_VALIDATION_LIMIT ); + print('AUTOVALIDATION'); + print('Find distributions from $from to $to'); + var ds = db.Distribution.manager.search( !$validated && ($end >= from) && ($end < to) , true); + for ( d in Lambda.array(ds)){ + if ( d.contract.type != db.Contract.TYPE_VARORDER ){ + ds.remove(d); + }else if ( !d.contract.amap.hasPayments() ){ + ds.remove(d); + } + } + for ( d in ds){ + print(d.toString()); + + service.PaymentService.validateDistribution(d); + + } + //email + var ds = tools.ObjectListTool.deduplicateDistribsByKey(ds); + for ( d in ds ){ + // var subj = d.contract.amap.name + t._(": Validation of the distribution of the ") + App.current.view.hDate(d.date); + var subj = t._("[::group::] Validation of the ::date:: distribution",{group : d.contract.amap.name , date : view.hDate(d.date)}); + var html = t._("
As you did not validate it manually after 10 days,
the delivery of the ::deliveryDate:: has been validated automatically
+