Commit Graph
12781 Commits
Author SHA1 Message Date
Jacques Le Roux 8221fd7899 New feature : in the POS adds the possibility to create a client profile (for now : name, email, phone#, card id for promo), email is also used to create an user login with card id as pwd (login/pwd couple follows changes).
The card id is stored in the Person.memberId field. It's used as a promo code. So if the same id is defined as a promocode, any promotion using this promo code will be added to the cart when you select a client from the Client Profile screen. Else a message will pop when selecting the client.
The idea is to generate promo codes and to use them as card id when creating the physical card.

The Client Profile screen (from Promo button in promo panel) allow you to search for all client (all fields empty) or to focus on a client (at least one field files). For now the search use a stric equals but I plan to allow also contains (ie %like%)
You may edit the client profile and as explained above select a client to apply promotions related to his/her card id.
I plan to add a status bar at bottom of the POS screen to see promocodes used (you may still enter arbitrary promo code with the Promo Code button) or even maybe rather the related promotions (but I doubt there will enough place).
The promo code is used as long as the cart is open.

There are also some generics enhancement in PosTransaction not all related to this new feature.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 09:24:54 +00:00
Hans Bakker 5db1f520cd partly revert 823414: move reply/forward together
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823439 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 07:41:06 +00:00
Bruno Busco 5a89692be7 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823416 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 06:04:13 +00:00
Hans Bakker 51089d0e52 move forward and eply actions together, closed the correct parent email, copy orginal and parent email id's
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823414 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 05:44:36 +00:00
Scott Gray 57b37ff840 Applied fix from Jeremy Wickersheimer OFBIZ-3011
getPartyNameForDate was comparing two Timestamps without specifying Timestamp as the type

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823406 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 04:42:55 +00:00
Scott Gray deddd560fe UiLabel fix from Brajesh Patel OFBIZ-3013
A german translation was incorrectly tagged as english

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823402 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 04:20:19 +00:00
Adam Heath 7f94829d66 Don't use the internal CacheLine value iterator, instead iterating
over the keys, fetching the value, and then removing when it matches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823319 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:49:17 +00:00
Adam Heath f4ce5e6276 Remove unneeded CacheLine import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823317 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:48:43 +00:00
Adam Heath 05f7b61a95 Generics markup for service method signatures.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823313 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:39:32 +00:00
Jacques Le Roux 57cbb35705 Avoid to have Paypal button encroachs the title bar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823301 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:07:20 +00:00
Adam Heath d9b4865da7 Misssed a few createCache calls, bother.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823299 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:51:50 +00:00
Adam Heath 2275cb5b78 Don't create CacheLineTable each time setPropertiesParam is called.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823298 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:49:57 +00:00
Adam Heath 3162462a72 Remove protected method, that isn't used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823289 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:38:29 +00:00
Bruno Busco df0479717f Changed from "Home" to "Applications" the Application menu label.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823239 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 17:34:46 +00:00
Bruno Busco a9635f3d73 Added missing "screenlet-body" tag
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823237 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 17:30:56 +00:00
Jacques Le Roux 8583100478 Fix a recursive bug
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823175 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:43:11 +00:00
Ashish Vijaywargiya 9251058d9c Applied patch from jira issue OFBIZ-3008 - Delete link is not working on Edit Facility Location screen.
Thanks Akash for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823165 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:24:39 +00:00
Ashish Vijaywargiya 361c35b84f ShipmentMenifest.fo.ftl uses UiLabel from OrderMgr component but it is not included in the Screen definition. Adding the missing UiLabel map entry.
Patch from Akash Jain - Thanks!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823163 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:23:04 +00:00
Anil Patel 5e1a81e8fe Updated UI label to use Edit instead of Create/Update, because its used on Edit screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823079 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 07:16:49 +00:00
Bruno Busco 4b65778461 Removed not used file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822948 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:27:45 +00:00
Bruno Busco 7c0b046d43 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822940 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:24:52 +00:00
Bruno Busco a2d935caa7 Fixed markup to the right screenlet pattern (all screenlet content should be contained in a screenlet-body tag)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822939 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:23:16 +00:00
Marco Risaliti 30c0052e9b Two labels translation used by new customer insertion on ecommerce component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822824 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 18:29:23 +00:00
Jacques Le Roux 592440841b No functional changes only in documentation : replace some value-name per value-field plus remove some wrong dashes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822659 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 10:54:11 +00:00
Hans Bakker 682a5ab55b add a new chapter for testtools in the apache technical document
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822639 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 10:03:29 +00:00
Jacopo Cappellato c222d81eaa "hard" wrapping was causing xml validation errors because new lines were added on form submit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822621 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 08:29:20 +00:00
Hans Bakker 65e4ea4bff rename suggestion of anil
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822615 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 07:31:58 +00:00
Jacques Le Roux a436b61bed Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822600 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 06:21:50 +00:00
Jacques Le Roux fa1f3ad932 Forgot findPartyFromTelephoneComplete in r822540
+ some superfluous white spaces removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822599 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 06:19:08 +00:00
Ashish Vijaywargiya 04b44f2c49 Removed missing UiLabel - instead of that used the existing one.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822597 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 05:53:30 +00:00
Anil Patel be9218c7ea Moved CommonPaymentDecorator to PaymentScreens file. Updated decorator location parameter name to paymentDecoratorLocation. This pattern is adopted from InvoiceScreens. This pattern allows to easily override decorator by specifying custom value to paymentDecoratorLocation parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822588 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 05:08:43 +00:00
Anil Patel ae2521e332 Removed extra container around labels in FindScreenDecorator. Applied style to label. This will eliminate extra div around text and also renders h1, h2 tags instead of using div with style=h1 (h2).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822581 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 04:22:19 +00:00
Jacques Le Roux 801e80acc5 Fix changes not ready to be commited :
findPartyFromTelephone restored, cleaned the log lines in findPartyFromTelephoneComplete


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822540 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 00:28:43 +00:00
Jacques Le Roux 093132e1e6 Fix a false log info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822537 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 23:29:09 +00:00
Scott Gray 3912358dc2 Fix a problem where we end up with multiple order payment statuses that are exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822536 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 23:28:52 +00:00
Jacques Le Roux 73c3ef546d Anymore BSH scripts but Groovy (while struggling with something that seems related to cache in POS, still investigating, really weird...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822532 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 23:10:12 +00:00
Scott Gray ca09f69b94 Fix an inconsistency in GenericEntity's get methods when the key doesn't exist, get(String) throws an exception but get(Object) just logs a warning. Changed so that both methods just log a warning.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822276 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 14:07:04 +00:00
Scott Gray 63f66f5384 Remove a duplicated demo OrderStatus record
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822251 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 12:44:30 +00:00
Ashish Vijaywargiya 7f971bac97 Now "product_type" tag will contain only values that are having ProductCategory.productCategoryTypeId = "GOOGLE_BASE_CATEGORY".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822222 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 11:22:02 +00:00
Ashish Vijaywargiya 515ed596dd If configuration settings are missing, may be either from data setup or from property file then provide verbose error message.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822195 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 10:24:31 +00:00
Hans Bakker 1d727fd8a3 added a selenium test when a opportunity is created from an email
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822169 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 08:47:35 +00:00
Bruno Busco c6aad8c403 Ooops,
Removed a screenlet container that I wrongly left in a previous commit (container to screenlet change)
Thank you Patrick Antivackis for reporting this in ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821907 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 16:31:14 +00:00
Ashish Vijaywargiya 128f931c7e Previously due to boolean value was passed in search, which was returning error, now if_exists pass the value of variable.
Patch from Chirag.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821811 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 14:39:49 +00:00
Ashish Vijaywargiya 3a747408fd GenericDelegator -> Delegator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821768 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 12:26:12 +00:00
Ashish Vijaywargiya e4e145bd0b Applied patch from jira issue OFBIZ-2998 - Shipping label pdf is not getting rendered properly.
Facility – > scheduling – > Label ,
1) Create an Order .
2) Pack that order items of that Order.
3) In the Facility Schedule screen schedule the shipment. This will start the process to get a label.
4) Label can be viewed in the Label screen under the schedule screens.

The batchPrintShippingLabels Pdf on this screen is not getting rendered properly .

Thanks Awdesh & Rishi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821748 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:36:34 +00:00
Jacques Le Roux de29e9a826 French label change for the sake of consistency with CommonSelect
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821745 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:32:41 +00:00
Ashish Vijaywargiya 2b1371c8f6 Applied patch from jira issue OFBIZ-2997 - Inventory Valuation tab not shown selected on Inventory Valuation Screen.
Accounting >> Organization GL Settings >> Accounting >> Reports >> Inventory Valuation
Here Inventory Valuation tab should be shown selected.
https://demo.ofbiz.org/accounting/control/InventoryValuation?organizationPartyId=Company

Thanks Chirag for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821734 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:11:05 +00:00
Hans Bakker 23b160661a paging on testsuites in selenium test corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821731 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:00:45 +00:00
Hans Bakker 512f29383d removed entries to non existing files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821710 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 07:56:50 +00:00
Scott Gray ab4dfc0c28 Fix bug reported by Abdullah Shaikh - OFBIZ-2978
It appears the PaymentGatewayServices method savePgr and its associated service savePaymentGatewayResponse was originally intended to support saving either PaymentGatewayResponse OR PaymentGatewayRespMsg values but at some point this has been reduced to supporting only PaymentGatewayResponse values.
Fixed by checking the entity name before running some PaymentGatewayResponse spcific code.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821705 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 07:19:42 +00:00