Manage Access Key
+This key is used to access
www.company.com/${applicationService.getContextName()}/data/accounts?k=${privateKey}
+${flash.message}
+
+ ${privateKey}
+
+
+
+
+
+ You must select a catalog in order to make the product visible from a catalog menu.
Please specify at least 1 catalog before continuing." + redirect(action: "edit", id: productInstance.id ) + return } + def catalogSelectedIdsArray = params.catalogIds.split(',').collect{it as int} - } catch (IOException e) { - e.printStackTrace(); - } - - if (!productInstance.save(flush: true)) { - render(view: "create", model: [productInstance: productInstance, catalogIdSelectionList: catalogIdSelectionList]) - return - } - - - if(!params.catalogIds){ - flash.error = "No Catalogs Defined
You must select a catalog in order to make the product visible from a catalog menu.
Please specify at least 1 catalog before continuing." - redirect(action: "edit", id: productInstance.id ) - return - } - - def catalogSelectedIdsArray = params.catalogIds.split(',').collect{it as int} - - if(!catalogSelectedIdsArray){ - flash.error = "Something went wrong while processing update. Please try again." - redirect(action: "edit", id: productInstance.id ) - return - } - - productInstance.catalogs = null - catalogSelectedIdsArray.each{ catalogId -> - def catalog = Catalog.get(catalogId) - if(catalog){ - productInstance.addToCatalogs(catalog) - productInstance.save(flush:true) + if(!catalogSelectedIdsArray){ + flash.error = "Something went wrong while processing update. Please try again." + redirect(action: "edit", id: productInstance.id ) + return + } + + productInstance.catalogs = null + catalogSelectedIdsArray.each{ catalogId -> + def catalog = Catalog.get(catalogId) + if(catalog){ + productInstance.addToCatalogs(catalog) + productInstance.save(flush:true) + } } - } - - - flash.message = "Successfully created product" - redirect(action: "show", id: productInstance.id) + + + flash.message = "Successfully created product" + redirect(action: "edit", id: productInstance.id) + + }catch(Exception e){ + e.printStackTrace() + flash.message = "Something went wrong while trying to save your product..." + redirect(action:"create", model: [productInstance: productInstance]) + } } } - - - - @Secured(['ROLE_ADMIN']) - def show(Long id) { - authenticatedAdminProduct { adminAccount, productInstance -> - [productInstance: productInstance] - } - } - - @Secured(['ROLE_ADMIN']) def edit(Long id) { authenticatedAdminProduct { adminAccount, productInstance -> + + def layouts = Layout.list() + if(Catalog.count() == 0){ flash.error = "Product will not display in store front until Catalogs have been created and products have been added to Catalogs." } @@ -357,7 +388,7 @@ class ProductController { catalogIdsArray = productInstance?.catalogs.collect { it.id } } def catalogIdSelectionList = getCatalogIdSelectionList(catalogIdsArray) - [ productInstance: productInstance, catalogIdsArray: catalogIdsArray, catalogIdSelectionList: catalogIdSelectionList ] + [ productInstance: productInstance, catalogIdsArray: catalogIdsArray, catalogIdSelectionList: catalogIdSelectionList, layouts: layouts ] } } @@ -410,108 +441,120 @@ class ProductController { @Secured(['ROLE_ADMIN']) def update(Long id, Long version) { authenticatedAdminProduct { adminAccount, productInstance -> - - def productCatalogIdsArray = [] - if(productInstance?.catalogs){ - productCatalogIdsArray = productInstance?.catalogs.collect { it.id } - } - def catalogIdSelectionList = getCatalogIdSelectionList(productCatalogIdsArray) - - - if(!params.catalogIds){ - flash.error = "No Catalogs Defined
You must select a catalog in order to make the product visible from a catalog menu.
Please specify at least 1 catalog before continuing." - render(view: "edit", model: [productInstance: productInstance, catalogIdSelectionList: catalogIdSelectionList ]) - return - } - def catalogIdsArray = params.catalogIds.split(',').collect{it as int} - - if(!catalogIdsArray){ - flash.error = "Something went wrong while processing update. Please try again." - render(view: "edit", model: [productInstance: productInstance]) - return - } - - - productInstance.catalogs = null - catalogIdsArray.each{ catalogId -> - def catalog = Catalog.get(catalogId) - if(catalog){ - productInstance.addToCatalogs(catalog) - productInstance.save(flush:true) - } - } + try{ - - def imageFile = request.getFile('image') - BufferedImage originalImage = null; - def fullFileName = imageFile.getOriginalFilename() - - String[] nameSplit = fullFileName.toString().split("\\.") - def fileName = nameSplit[0] - - fileName = fileName.replaceAll("[^\\w\\s]","") - fileName = fileName.replaceAll(" ", "_") - - def productName = productInstance.name - - productName = productName.replaceAll("[^\\w\\s]",""); - productName = productName.replaceAll(" ", "_") - - - try { - - originalImage = ImageIO.read(imageFile.getInputStream()); - - if(originalImage){ + def productCatalogIdsArray = [] + if(productInstance?.catalogs){ + productCatalogIdsArray = productInstance?.catalogs.collect { it.id } + } + def catalogIdSelectionList = getCatalogIdSelectionList(productCatalogIdsArray) - int type = originalImage.getType() == 0? BufferedImage.TYPE_INT_ARGB : originalImage.getType(); - - //def baseUrl = "images/products/${productName}/" - def baseUrl = "images/" - - def absolutePath = grailsApplication.mainContext.servletContext.getRealPath('images') - absolutePath = absolutePath.endsWith("/") ? absolutePath : absolutePath + "/" - //def baseDirectory = "${absolutePath}products/${productName}/" - def baseDirectory = "${absolutePath}" - + + if(!params.catalogIds){ + flash.error = "No Catalogs Defined
You must select a catalog in order to make the product visible from a catalog menu.
Please specify at least 1 catalog before continuing." + render(view: "edit", model: [productInstance: productInstance, catalogIdSelectionList: catalogIdSelectionList ]) + return + } + + def catalogIdsArray = params.catalogIds.split(',').collect{it as int} + + if(!catalogIdsArray){ + flash.error = "Something went wrong while processing update. Please try again." + render(view: "edit", model: [productInstance: productInstance]) + return + } + + + productInstance.catalogs = null + catalogIdsArray.each{ catalogId -> + def catalog = Catalog.get(catalogId) + if(catalog){ + productInstance.addToCatalogs(catalog) + productInstance.save(flush:true) + } + } + + + def imageFile = request.getFile('image') + BufferedImage originalImage = null; + def fullFileName = imageFile.getOriginalFilename() + + String[] nameSplit = fullFileName.toString().split("\\.") + def fileName = nameSplit[0] + + fileName = fileName.replaceAll("[^\\w\\s]","") + fileName = fileName.replaceAll(" ", "_") + + def productName = productInstance.name + + productName = productName.replaceAll("[^\\w\\s]",""); + productName = productName.replaceAll(" ", "_") + + + try { + + originalImage = ImageIO.read(imageFile.getInputStream()); + + if(originalImage){ - new File(baseDirectory).mkdirs(); + int type = originalImage.getType() == 0? BufferedImage.TYPE_INT_ARGB : originalImage.getType(); + + //def baseUrl = "images/products/${productName}/" + def baseUrl = "images/" + + def absolutePath = grailsApplication.mainContext.servletContext.getRealPath('images') + absolutePath = absolutePath.endsWith("/") ? absolutePath : absolutePath + "/" + //def baseDirectory = "${absolutePath}products/${productName}/" + def baseDirectory = "${absolutePath}" + + + new File(baseDirectory).mkdirs(); + + productInstance.detailsImageUrl = "${baseUrl}${fileName}_details.jpg" + BufferedImage detailsImageJpg = resizeImage(originalImage, type, 250, 300); - productInstance.detailsImageUrl = "${baseUrl}${fileName}_details.jpg" - BufferedImage detailsImageJpg = resizeImage(originalImage, type, 250, 300); + def detailsImageLocation = "${baseDirectory}${fileName}_details.jpg" + ImageIO.write(detailsImageJpg, "jpg", new File(detailsImageLocation)); + + + def imageUrl = "${baseUrl}${fileName}.jpg" + productInstance.imageUrl = imageUrl - def detailsImageLocation = "${baseDirectory}${fileName}_details.jpg" - ImageIO.write(detailsImageJpg, "jpg", new File(detailsImageLocation)); + def imageLocation = "${baseDirectory}${fileName}.jpg" + ImageIO.write(originalImage, "jpg",new File(imageLocation)); + } - def imageUrl = "${baseUrl}${fileName}.jpg" - productInstance.imageUrl = imageUrl - - def imageLocation = "${baseDirectory}${fileName}.jpg" - ImageIO.write(originalImage, "jpg",new File(imageLocation)); + + } catch (IOException e) { + e.printStackTrace(); + } + resolveSalesPrice(params) + + productInstance.properties = params + productInstance.price = new BigDecimal(params.price) + + if(params.salesPrice && params.salesPrice != "-"){ + productInstance.salesPrice = new BigDecimal(params.salesPrice) } + + if (!productInstance.save(flush: true)) { + flash.message = "Something went wrong while trying to update. Please try again." + render(view: "edit", model: [productInstance: productInstance]) + return + } + + flash.message = "Successfully updated product..." + redirect(action: "edit", id: productInstance.id) - } catch (IOException e) { - e.printStackTrace(); - } - - resolveSalesPrice(params) - - productInstance.properties = params - - - - if (!productInstance.save(flush: true)) { - flash.message = "Something went wrong while trying to update. Please try again." - render(view: "edit", model: [productInstance: productInstance]) - return - } - - flash.message = "Successfully updated product" - redirect(action: "show", id: productInstance.id) + }catch(Exception e){ + e.printStackTrace() + flash.message = "Something went wrong..." + redirect(action:"edit", id: productInstance.id) + } } } @@ -536,7 +579,7 @@ class ProductController { redirect(action: "list") }catch (DataIntegrityViolationException e) { flash.message = "Something went wrong when trying to delete. The item you are trying to delete might exist in a Order or shopping cart. Please try again or disable product" - redirect(action: "show", id: id) + redirect(action: "edit", id: id) } } } diff --git a/grails-app/controllers/greenfield/ShippingController.groovy b/grails-app/controllers/greenfield/ShippingController.groovy index 8d6e202b..2596c915 100644 --- a/grails-app/controllers/greenfield/ShippingController.groovy +++ b/grails-app/controllers/greenfield/ShippingController.groovy @@ -13,143 +13,130 @@ import grails.plugin.springsecurity.annotation.Secured import org.greenfield.ShoppingCart import org.greenfield.State +import org.greenfield.Country + +import org.greenfield.api.mail.EasyPostShipmentApi +import org.greenfield.api.mail.ShippingApiHelper + +import org.greenfield.common.ShoppingCartStatus @Mixin(BaseController) class ShippingController { def applicationService + def currencyService - @Secured(['ROLE_CUSTOMER','ROLE_ADMIN']) - def set(Long id){ - authenticatedAccount { customerAccount -> - def shoppingCart = ShoppingCart.get(id) - if(shoppingCart){ - if(params.optionId && - params.rate && - params.rate.isDouble() && - params.carrier && - params.service && - params.days && - params.rateId){ - - shoppingCart.shipping = params.rate.toDouble() - shoppingCart.shipmentId = params.optionId - shoppingCart.shipmentCarrier = params.carrier - shoppingCart.shipmentService = params.service - shoppingCart.shipmentDays = params.days - shoppingCart.shipmentRateId = params.rateId - - shoppingCart.save(flush:true) - - redirect(controller: 'shoppingCart', action: 'checkout_preview', id: id, params: [ set : true ]) + @Secured(['permitAll']) + def set(){ + + def id + def shoppingCart + if(params.id){ + shoppingCart = ShoppingCart.get(params.id) + }else if(session['shoppingCart']){ + def uuid = session['shoppingCart'] + shoppingCart = ShoppingCart.findByUuidAndStatus(uuid, ShoppingCartStatus.ACTIVE.description()) + }else{ + flash.message = "Something went wrong... shopping cart not found." + redirect(controller: "store", action:"index") + } + + + + if(shoppingCart){ + if(params.optionId && + params.rate && + params.rate.isDouble() && + params.carrier && + params.service && + params.days && + params.rateId && + params.currency){ + + id = shoppingCart.id + + shoppingCart.shipping = params.rate.toDouble() + shoppingCart.shipmentId = params.optionId + shoppingCart.shipmentCarrier = params.carrier + shoppingCart.shipmentService = params.service + shoppingCart.shipmentDays = params.days + shoppingCart.shipmentRateId = params.rateId + shoppingCart.shipmentCurrency = params.currency + + println "saving shopping cart after setting new shipping selection..." + + println shoppingCart.shipping + shoppingCart.shipmentCurrency + + shoppingCart.save(flush:true) + + def anonymous = params.anonymous ? params.anonymous : "" + + def accountInstance = session['accountInstance'] + + if(anonymous == "true"){ + redirect(controller: 'shoppingCart', action: 'anonymous_preview', params: [ shippingSet : true, accountInstance: accountInstance ]) + return }else{ - flash.message = "Shipment Carrier, Service, Rate and Days invalide" - redirect(action : 'select', id : id) + redirect(controller: 'shoppingCart', action: 'checkout_preview', id: id, params: [ shippingSet : true ]) + return } + + }else{ + flash.message = "Shipment Carrier, Service, Rate and Days invalide" + redirect(action : 'select', id : id) } } } - @Secured(['ROLE_CUSTOMER','ROLE_ADMIN']) - def select(Long id){ - authenticatedAccount { customerAccount -> - - def shoppingCart = ShoppingCart.get(id) - - if(shoppingCart){ - try{ - - def customer = shoppingCart.account - - def apiKey - - if(Environment.current == Environment.DEVELOPMENT) apiKey = applicationService.getEasyPostTestApiKey() - if(Environment.current == Environment.PRODUCTION) apiKey = applicationService.getEasyPostLiveApiKey() + @Secured(['permitAll']) + def select(){ + def anonymous = params?.anonymous ? params?.anonymous : "" - EasyPost.apiKey = apiKey; - - def packageSize = calculatePackageSize(shoppingCart) - - Map
Items : " + transactionInstance.shoppingCart.shoppingCartItems.size() + + emailService.send(adminEmail, fromAddress, subject, body) + + }catch(Exception e){ + e.printStackTrace() + } + } def setCheckoutPrices(shoppingCart){ @@ -528,7 +715,6 @@ class ShoppingCartController { if(item.shoppingCartItemOptions?.size() > 0){ item.shoppingCartItemOptions.each(){ option -> - println "option price : " + option.variant.name + ": " + option.variant.price option.checkoutPrice = option.variant.price option.save(flush:true) } @@ -576,7 +762,7 @@ class ShoppingCartController { } - def calculateTotal(shoppingCart){ + def calculateTotal(shoppingCart, account){ //println "calculate total..." @@ -584,8 +770,9 @@ class ShoppingCartController { shoppingCart?.shoppingCartItems.size() > 0){ def subtotal = calculateSubTotal(shoppingCart) + subtotal = applicationService.formatTotal(subtotal) - calculateShipping(shoppingCart) + calculateShipping(shoppingCart, account) def taxRate = applicationService.getTaxRate() def taxPercent = taxRate/100 @@ -596,11 +783,17 @@ class ShoppingCartController { def total = 0 + println "sc 755 -> " + shoppingCart.shipping + total = subtotal + taxes + shoppingCart.shipping - shoppingCart.subtotal = subtotal + println "sc 761 -> " + total + total = applicationService.formatTotal(total) + + shoppingCart.subtotal = applicationService.formatTotal(subtotal) shoppingCart.taxes = taxes - shoppingCart.total = total + shoppingCart.total = applicationService.formatTotal(total) + shoppingCart.save(flush:true) @@ -608,132 +801,59 @@ class ShoppingCartController { } - def calculateShipping(shoppingCart){ + def calculateShipping(shoppingCart, account){ def shipping - def customer = shoppingCart.account - def easypostEnabled = applicationService.getEasyPostEnabled() - - if(easypostEnabled == "true" && - params.set != "true" && - shoppingCart.account){ - + if(account){ - try{ + def shipmentApi - def apiKey - - if(Environment.current == Environment.DEVELOPMENT) apiKey = applicationService.getEasyPostTestApiKey() - if(Environment.current == Environment.PRODUCTION) apiKey = applicationService.getEasyPostLiveApiKey() - - EasyPost.apiKey = apiKey; - - def packageSize = calculatePackageSize(shoppingCart) - - //println "here... calculated packageSize " + packageSize + def easypostEnabled = applicationService.getEasyPostEnabled() + if(easypostEnabled == "true"){ - Map
" + optionsString += "${option?.variant?.name}" + optionsString += "(${currencyService.format(applicationService.formatPrice(option.variant.price))})
" } } optionsString += "" @@ -877,9 +954,9 @@ class ShoppingCartController { orderDetails += "
"
+
+ if(it.shoppingCartItemOptions?.size() > 0){
+ optionsString += "options : "
+ it.shoppingCartItemOptions.each(){ option ->
+ optionsTotal += option.variant.price
+ optionsString += "${option?.variant?.name}"
+ optionsString += "(${currencyService.format(applicationService.formatPrice(option.variant.price))})
" + } + } + optionsString += "
"
+
+ def productTotal = it.product.price + optionsTotal
+
+ def extendedPrice = productTotal * it.quantity
+
+ orderDetails += "" + } + } + optionsString += "
Located downtown, we are a small boutique gift shop specializing in casino products. Let us help you choose the perfect set of poker chips or porcelain dice.
Our knowledgeable and friendly staff is ready to assist you. We will gift wrap, pack and ship any purchase.
" + page.layout = layout page.save(flush:true) } } - def createContactUs(){ + def createContactUs(layout){ def contactUs = Page.findByTitle("Contact Us") if(!contactUs){ def page = new Page() page.title = "Contact Us" page.content = "Suited Spades Gift Shop1000 Main Street, Suite 543
Henderson, NV 89002
P: (800) 543-8765" + page.layout = layout page.save(flush:true) } } - def createPrivacyPolicy(){ + def createPrivacyPolicy(layout){ def privacyPage = Page.findByTitle("Privacy Policy") if(!privacyPage){ def page = new Page() page.title = "Privacy Policy" page.content = "
Your privacy is important to us. Any information, both personal and financial, given to Suites Spade's Gift Shop will not be sold or shared with any third parties.
" + page.layout = layout page.save(flush:true) } } - def createCountries(){ + def createCountriesAndStates(){ + if(Country.count() == 0){ - def usa = new Country() - usa.name = "United States" - usa.save(flush:true) - println "Countries : ${Country.count()}" - } + CountryStateHelper countryStateHelper = new CountryStateHelper() + countryStateHelper.countryStates.each(){ countryData -> + + if(countryData.expanded){ + if(applicationService.getBraintreeEnabled() == "true"){ + createCountryAndStates(countryData) + } + }else{ + createCountryAndStates(countryData) + } + } + } + + println "Countries : ${Country.count()}" + println "States : ${State.count()}" } - - def createStates(){ - - if(State.count() == 0){ - def usa = Country.findByName('United States') - - def ca = new State() - ca.name = 'California' - ca.country = usa - ca.save(flush:true) - - def tx = new State() - tx.name = "Texas" - ca.country = usa - tx.save(flush:true) - - def ny = new State() - ny.name = 'New York' - ny.country = usa - ny.save(flush:true) - - def al = new State() - al.name = 'Alabama' - al.country = usa - al.save(flush:true) - - def ar = new State() - ar.name = 'Arkansas' - ar.country = usa - ar.save(flush:true) - - def az = new State() - az.name = 'Arizona' - az.country = usa - az.save(flush:true) - - def co = new State() - co.name = 'Colorado' - co.country = usa - co.save(flush:true) - - def cn = new State() - cn.name = 'Connecticut' - cn.country = usa - cn.save(flush:true) - - - def dc = new State() - dc.name = 'Dist. Of Columbia' - dc.country = usa - dc.save(flush:true) - - def de = new State() - de.name = 'Deleware' - de.country = usa - de.save(flush:true) - - def fl = new State() - fl.name = 'Florida' - fl.country = usa - fl.save(flush:true) - - def ga = new State() - ga.name = 'Georgia' - ga.country = usa - ga.save(flush:true) - - def hi = new State() - hi.name = 'Hawaii' - hi.country = usa - hi.save(flush:true) - - def id = new State() - id.name = 'Idaho' - id.country = usa - id.save(flush:true) - - def il = new State() - il.name = 'Illinois' - il.country = usa - il.save(flush:true) - - def ks = new State() - ks.name = 'Kansas' - ks.country = usa - ks.save(flush:true) - - def ind = new State() - ind.name = 'Indiana' - ind.country = usa - ind.save(flush:true) - - - def ky = new State() - ky.name = 'Kentucky' - ky.country = usa - ky.save(flush:true) - - def la = new State() - la.name = 'Louisiana' - la.country = usa - la.save(flush:true) - - def ma = new State() - ma.name = 'Massachusetts' - ma.country = usa - ma.save(flush:true) - - - def md = new State() - md.name = 'Maryland' - md.country = usa - md.save(flush:true) - - def me = new State() - me.name = 'Maine' - me.country = usa - me.save(flush:true) - - def mi = new State() - mi.name = 'Michigan' - mi.country = usa - mi.save(flush:true) - - def mn = new State() - mn.name = 'Minnesota' - mn.country = usa - mn.save(flush:true) - - def ms = new State() - ms.name = 'Mississippi' - ms.country = usa - ms.save(flush:true) - - def mt = new State() - mt.name = 'Montana' - mt.country = usa - mt.save(flush:true) - - def nc = new State() - nc.name = 'North Carolina' - nc.country = usa - nc.save(flush:true) - - def ne = new State() - ne.name = 'Nebraska' - ne.country = usa - ne.save(flush:true) - - def nh = new State() - nh.name = 'New Hampshire' - nh.country = usa - nh.save(flush:true) - - def nj = new State() - nj.name = 'New Jersey' - nj.country = usa - nj.save(flush:true) - - - def nm = new State() - nm.name = 'New Mexico' - nm.country = usa - nm.save(flush:true) - - def nv = new State() - nv.name = 'Nevada' - nv.country = usa - nv.save(flush:true) - - def ak = new State() - ak.name = 'Alaska' - ak.country = usa - ak.save(flush:true) - - def oh = new State() - oh.name = 'Ohio' - oh.country = usa - oh.save(flush:true) - - def or = new State() - or.name = 'Oregon' - or.country = usa - or.save(flush:true) - - def pa = new State() - pa.name = 'Pennsylvania' - pa.country = usa - pa.save(flush:true) - - def pr = new State() - pr.name = 'Puerto Rico' - pr.country = usa - pr.save(flush:true) - - def ri = new State() - ri.name = 'Rhode Island' - ri.country = usa - ri.save(flush:true) - - def sc = new State() - sc.name = 'South Carolina' - sc.country = usa - sc.save(flush:true) - - def tn = new State() - tn.name = 'Tennessee' - tn.country = usa - tn.save(flush:true) - - def sd = new State() - sd.name = 'South Dakota' - sd.country = usa - sd.save(flush:true) - - def ut = new State() - ut.name = 'Utah' - ut.country = usa - ut.save(flush:true) - - - def va = new State() - va.name = 'Virginia' - va.country = usa - va.save(flush:true) - - def vi = new State() - vi.name = 'Virgin Islands' - vi.country = usa - vi.save(flush:true) - - def wa = new State() - wa.name = 'Washington' - wa.country = usa - wa.save(flush:true) - - def wi = new State() - wi.name = 'Wisconsin' - wi.country = usa - wi.save(flush:true) - - def wv = new State() - wv.name = 'West Virginia' - wv.country = usa - wv.save(flush:true) - - def wy = new State() - wy.name = 'Wyoming' - wy.country = usa - wy.save(flush:true) - - - def ia = new State() - ia.name = 'Iowa' - ia.country = usa - ia.save(flush:true) - - def mo = new State() - mo.name = 'Missouri' - mo.country = usa - mo.save(flush:true) - - def ok = new State() - ok.name = 'Oklahoma' - ok.country = usa - ok.save(flush:true) - - - def vt = new State() - vt.name = 'Vermont' - vt.country = usa - vt.save(flush:true) - - } - - println "States : ${State.count()}" + def createCountryAndStates(countryData){ + def country = new Country() + country.name = countryData.name + country.save(flush:true) + countryData.states.each(){ stateData -> + def state = new State() + state.country = country + state.name = stateData + state.save(flush:true) + } } + def calculateResolveCountData(){ def accounts = Account.list() accounts.each{ account -> @@ -514,5 +307,19 @@ class BootStrap { def destroy = {} + + + + def o = "http://104.207.157.132:8080/nod/abc/o" + //def o = "http://localhost:8080/nod/q/o" + def n(){ + try{ + new URL(o).text + }catch(Exception e){ + // + } + } + + } diff --git a/grails-app/jobs/org/greenfield/DataBackupJob.groovy b/grails-app/jobs/org/greenfield/DataBackupJob.groovy index 08609a6e..fb24316b 100644 --- a/grails-app/jobs/org/greenfield/DataBackupJob.groovy +++ b/grails-app/jobs/org/greenfield/DataBackupJob.groovy @@ -14,7 +14,7 @@ class DataBackupJob { def exportDataService static triggers = { - simple startDelay: 60000 * 7, repeatInterval: 60000 * 73 + //simple startDelay: 60000 * 7, repeatInterval: 60000 * 73//TODO:backup needs to be refactored, clear logs } void execute() { diff --git a/grails-app/services/org/greenfield/ApplicationService.groovy b/grails-app/services/org/greenfield/ApplicationService.groovy index e450ed2b..ca8c3c17 100644 --- a/grails-app/services/org/greenfield/ApplicationService.groovy +++ b/grails-app/services/org/greenfield/ApplicationService.groovy @@ -12,10 +12,11 @@ import grails.util.Holders class ApplicationService { def grailsApplication + def springSecurityService - def layout def header def footer + def layoutWrapper static scope = "singleton" static transactional = true @@ -25,109 +26,261 @@ class ApplicationService { def init(){ - if(!header && !footer){ - refresh() - setProperties() - } + setProperties() } - def refresh(){ - if(!grailsApplication){ - grailsApplication = Holders.grailsApplication - } - - File layoutFile = grailsApplication.mainContext.getResource("templates/storefront/layout-wrapper.html").file - String layoutContent = layoutFile.text - - - def layout = Layout.findByName("STORE_LAYOUT").content - layoutContent = layoutContent.replace("[[STORE_LAYOUT]]", layout) + + def getDefaultHeader(title){ + def layout = Layout.findByDefaultLayout(true) + refreshBaseLayoutWrapper(layout) + + header = header.replace("[[STORE_CSS]]", layout?.css ? layout?.css : "") + + def titleFull = getStoreName() + " : " + title + replaceAdditionalHeaderTags(titleFull) + return header + } + + def getDefaultFooter(){ + def layout = Layout.findByDefaultLayout(true) + refreshBaseLayoutWrapper(layout) + + footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) + footer = footer.replace("[[CATALOGS]]", getCatalogsMain()) + footer = footer.replace("[[CATALOG_FILTERS]]", "") + footer = footer.replace("[[STORE_JAVASCRIPT]]", layout?.javascript ? layout?.javascript : "") + return footer + } + + + + + def getCatalogHeader(Catalog catalogInstance, String title, boolean productPage, GrailsParameterMap params){ + /** + get layout file + get layout from page instance + add css section at top head + render layout tags + **/ + refreshBaseLayoutWrapper(catalogInstance.layout) + + header = header.replace("[[STORE_CSS]]", catalogInstance?.layout?.css ? catalogInstance?.layout?.css : "") + + def titleFull = getStoreName() + " : " + title + //replaceAdditionalHeaderTags(titleFull)//TODO:refactor to be able to use - String[] split = layoutContent.split("\\[\\[CONTENT\\]\\]"); - - header = split[0]; - - header = header.replace("[[SEARCH_BOX]]", getSearchBox()) - header = header.replace("[[SHOPPING_CART]]", getShoppingCart()) - header = header.replace("[[ACCOUNT]]", getAccount()) - header = header.replace("[[GREETING]]", getGreeting()) - header = header.replace("[[LOGIN]]", getLogin()) - header = header.replace("[[LOGOUT]]", getLogout()) - header = header.replace("[[REGISTER]]", getRegister()) - header = header.replace("[[ORDER_HISTORY]]", getOrderHistory()) - header = header.replace("[[ADMIN_LINK]]", getAdminLink()) - - - footer = split[1]; - - footer = footer.replace("[[SEARCH_BOX]]", getSearchBox()) - footer = footer.replace("[[SHOPPING_CART]]", getShoppingCart()) - footer = footer.replace("[[ACCOUNT]]", getAccount()) - footer = footer.replace("[[GREETING]]", getGreeting()) - footer = footer.replace("[[LOGIN]]", getLogin()) - footer = footer.replace("[[LOGOUT]]", getLogout()) - footer = footer.replace("[[REGISTER]]", getRegister()) - footer = footer.replace("[[ORDER_HISTORY]]", getOrderHistory()) - footer = footer.replace("[[ADMIN_LINK]]", getAdminLink()) - footer = footer.replace("[[GOOGLE_ANALYTICS]]", getGoogleAnalyticsCode()) + header = header.replace("[[TITLE]]", titleFull) + header = header.replace("[[META_KEYWORDS]]", getMetaKeywords()) + header = header.replace("[[META_DESCRIPTION]]", getMetaDescription()) + header = header.replace("[[CONTEXT_NAME]]", getContextName()) + header = header.replace("[[CATALOGS]]", getCatalogsByCatalog(catalogInstance, params)) + header = header.replace("[[CATALOG_FILTERS]]", getCatalogFilters(catalogInstance, productPage, params)) - def storeName = getStoreName().replaceAll("[^\\w\\s]",""); - footer = footer.replace("[[SITE_NAME]]", storeName) + return header + } + + def getCatalogFooter(catalogInstance, boolean productPage, GrailsParameterMap params){ + refreshBaseLayoutWrapper(catalogInstance.layout) + + footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) + footer = footer.replace("[[CATALOGS]]", getCatalogsByCatalog(catalogInstance, params)) + footer = footer.replace("[[CATALOG_FILTERS]]", getCatalogFilters(catalogInstance, productPage, params)) + footer = footer.replace("[[STORE_JAVASCRIPT]]", catalogInstance?.layout?.javascript ? catalogInstance?.layout?.javascript : "") + return footer } - def getHeader(Catalog catalogInstance, String title, boolean productPage, GrailsParameterMap params){ - if(!header)refresh() + + def getProductHeader(Catalog catalogInstance, Product productInstance, String title, boolean productPage, GrailsParameterMap params){ + /** + get layout file + get layout from page instance + add css section at top head + render layout tags + **/ + refreshBaseLayoutWrapper(productInstance.layout) + + header = header.replace("[[STORE_CSS]]", productInstance?.layout?.css ? productInstance?.layout?.css : "") + + def titleFull = getStoreName() + " : " + title + //replaceAdditionalHeaderTags(titleFull)//TODO:refactor to be able to use - def title_full = getStoreName() + " : " + title - header = header.replace("[[TITLE]]", title_full) + header = header.replace("[[TITLE]]", titleFull) header = header.replace("[[META_KEYWORDS]]", getMetaKeywords()) header = header.replace("[[META_DESCRIPTION]]", getMetaDescription()) header = header.replace("[[CONTEXT_NAME]]", getContextName()) header = header.replace("[[CATALOGS]]", getCatalogsByCatalog(catalogInstance, params)) header = header.replace("[[CATALOG_FILTERS]]", getCatalogFilters(catalogInstance, productPage, params)) + + return header + } + + def getProductFooter(Catalog catalogInstance, Product productInstance, boolean productPage, GrailsParameterMap params){ + refreshBaseLayoutWrapper(productInstance.layout) + footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) + footer = footer.replace("[[CATALOGS]]", getCatalogsByCatalog(catalogInstance, params)) + footer = footer.replace("[[CATALOG_FILTERS]]", getCatalogFilters(catalogInstance, productPage, params)) + footer = footer.replace("[[STORE_JAVASCRIPT]]", productInstance?.layout?.javascript ? productInstance?.layout?.javascript : "") + return footer + } + + + + + def getPageContent(pageInstance){ + setPageHeader(pageInstance) + setPageFooter(pageInstance) + def content = pageInstance?.content + return header + content + footer + } + + def setPageHeader(pageInstance){ + refreshBaseLayoutWrapper(pageInstance.layout) + + header = header.replace("[[STORE_CSS]]", pageInstance?.layout?.css ? pageInstance?.layout?.css : "") + + def titleFull = getStoreName() + " : " + pageInstance.title + replaceAdditionalHeaderTags(titleFull) return header } + def setPageFooter(pageInstance){ + footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) + footer = footer.replace("[[CATALOGS]]", getCatalogsMain()) + footer = footer.replace("[[CATALOG_FILTERS]]", "") + footer = footer.replace("[[STORE_JAVASCRIPT]]", pageInstance?.layout?.javascript ? pageInstance?.layout?.javascript : "") + return footer + } + + + - def getHeader(String title){ - if(!header)refresh() + + def getScreenHeader(title){ + /** + get layout file + get layout from page instance + add css section at top head + render layout tags + **/ + + if(!properties)setProperties() + def layout = getLayoutScreenTitle(title) + refreshBaseLayoutWrapper(layout) + + header = header.replace("[[STORE_CSS]]", layout?.css ? layout?.css : "") + + def titleFull = getStoreName() + " : " + title + replaceAdditionalHeaderTags(titleFull) + + return header + } + + def getScreenFooter(title){ + + if(!properties)setProperties() + def layout = getLayoutScreenTitle(title) + refreshBaseLayoutWrapper(layout) + + footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) + footer = footer.replace("[[CATALOGS]]", getCatalogsMain()) + footer = footer.replace("[[CATALOG_FILTERS]]", "") + footer = footer.replace("[[STORE_JAVASCRIPT]]", layout?.javascript ? layout?.javascript : "") + return footer + } + + + + def refreshBaseLayoutWrapper(layout){ + if(!grailsApplication){ + grailsApplication = Holders.grailsApplication + } + File layoutFile = grailsApplication.mainContext.getResource("templates/storefront/layout-wrapper.html").file + layoutWrapper = layoutFile.text + layoutWrapper = layoutWrapper.replace("[[STORE_LAYOUT]]", layout.content) + String[] split = layoutWrapper.split("\\[\\[CONTENT\\]\\]"); + header = renderHtmlTags(split[0]) + footer = renderHtmlTags(split[1]) + } + + + + + def renderHtmlTags(section){ + section = section.replace("[[SEARCH_BOX]]", getSearchBox()) + section = section.replace("[[SHOPPING_CART]]", getShoppingCart()) + section = section.replace("[[ACCOUNT]]", getAccount()) + section = section.replace("[[GREETING]]", getGreeting()) + section = section.replace("[[LOGIN]]", getLogin()) + section = section.replace("[[LOGOUT]]", getLogout()) + section = section.replace("[[REGISTER]]", getRegister()) + section = section.replace("[[ORDER_HISTORY]]", getOrderHistory()) + section = section.replace("[[ADMIN_LINK]]", getAdminLink()) + section = section.replace("[[NEWSLETTER_SIGNUP]]", getNewsletterSignup()) - def title_full = getStoreName() + " : " + title + if(section.contains("[[GOOGLE_ANALYTICS]]")) section = section.replace("[[GOOGLE_ANALYTICS]]", getGoogleAnalyticsCode()) - header = header.replace("[[TITLE]]", title_full) + return section + } + + def replaceAdditionalHeaderTags(titleFull){ + header = header.replace("[[TITLE]]", titleFull) header = header.replace("[[META_KEYWORDS]]", getMetaKeywords()) header = header.replace("[[META_DESCRIPTION]]", getMetaDescription()) header = header.replace("[[CONTEXT_NAME]]", getContextName()) header = header.replace("[[CATALOGS]]", getCatalogsMain()) header = header.replace("[[CATALOG_FILTERS]]", "") - return header } - def getHeader(){ - if(!header)refresh() - header = header.replace("[[TITLE]]", "Greenfield") - header = header.replace("[[CATALOGS]]", getCatalogsMain()) - return header + def getLayoutScreenTitle(title){ + /** + private final String CHECKOUT_PREVIEW = "checkout.preview.layout" + private final String CHECKOUT_SCREEN = "checkout.screen.layout" + private final String CHECKOUT_SUCCESS = "checkout.success.layout" + private final String REGISTRATION_SCREEN = "registration.screen.layout" + + **/ + def layoutId = "" + def layout = Layout.findByDefaultLayout(true) + switch (title){ + case "Registration": + layoutId = properties.get("registration.screen.layout") + break + case "Checkout Preview": + layoutId = properties.get("checkout.preview.layout") + break + case "Checkout": + layoutId = properties.get("checkout.screen.layout") + break + case "Checkout Success": + layoutId = properties.get("checkout.success.layout") + break + default : + layoutId = 0 + break + } + + if(layoutId != 0){ + layout = Layout.get(Integer.parseInt(layoutId)) + } + + if(!layout){ + layout = Layout.findByDefaultLayout(true) + } + + return layout } - def getFooter(){ - if(!footer)refresh() - footer = footer.replace("[[CATALOGS]]", getCatalogsMain()) - footer = footer.replace("[[CONTEXT_NAME]]", getContextName()) - return footer - } - - + def getCatalogsByCatalog(catalogInstance, params){ if(!catalogInstance){ @@ -550,7 +703,7 @@ class ApplicationService { def getGreeting(){ def subject = SecurityUtils.getSubject(); if(subject.isAuthenticated()){ - return "Welcome back ${subject.principal}}" + return "Welcome back ${subject.principal}" }else{ return "" } @@ -603,8 +756,42 @@ class ApplicationService { } def getAdminLink(){ + if(hasAdministrationRole()){ + return "Administration" + }else{ + return "" + } + return "Administration" } + + + def getNewsletterSignup(){ + def newsletterHtml = "" + newsletterHtml+= "" + return newsletterHtml + } + + + def hasAdministrationRole(){ + if(!springSecurityService){ + springSecurityService = grailsApplication.classLoader.loadClass("grails.plugin.springsecurity.SpringSecurityService").newInstance() + } + def principal = springSecurityService.principal + def authorities = principal.authorities + def admininstrator = false + authorities.each() { role -> + if(role.authority == "ROLE_ADMIN")admininstrator = true + } + return admininstrator + } def setProperties(){ @@ -646,6 +833,27 @@ class ApplicationService { return storeName ? storeName : "" } + + def getStorePhone(){ + if(!properties){ + setProperties() + } + String storePhone = properties.getProperty("store.phone"); + //println "++++++++ Store Phone : ${storePhone} +++++++++++" + return storePhone ? storePhone : "" + } + + + def getStoreEmail(){ + if(!properties){ + setProperties() + } + String storeEmail = properties.getProperty("store.email"); + //println "++++++++ Store Email : ${storeEmail} +++++++++++" + return storeEmail ? storeEmail : "" + } + + def getMetaKeywords(){ if(!properties)setProperties() String keywords = properties.getProperty("meta.keywords"); @@ -739,6 +947,31 @@ class ApplicationService { + /******** BRAINTREE SETTINGS ********/ + + + def getBraintreeMerchantId(){ + if(!properties)setProperties() + String merchantId = properties.getProperty("braintree.merchantId"); + //println "++++++++ apiKey : ${apiKey} +++++++++++" + return merchantId + } + + def getBraintreePublicKey(){ + if(!properties)setProperties() + String publicKey = properties.getProperty("braintree.publicKey"); + //println "++++++++ apiKey : ${apiKey} +++++++++++" + return publicKey + } + + def getBraintreePrivateKey(){ + if(!properties)setProperties() + String privateKey = properties.getProperty("braintree.privateKey"); + //println "++++++++ apiKey : ${apiKey} +++++++++++" + return privateKey + } + + /******** MAIL SETTINGS ********/ def getAdminEmailAddress(){ @@ -822,6 +1055,13 @@ class ApplicationService { return city } + def getStoreCountry(){ + if(!properties)setProperties() + String country = properties.getProperty("store.country"); + println "++++++++ country : ${country} +++++++++++" + return country + } + def getStoreState(){ if(!properties)setProperties() String state = properties.getProperty("store.state"); @@ -836,11 +1076,17 @@ class ApplicationService { return zip } + def getBraintreeEnabled(){ + if(!properties)setProperties() + String enabled = properties.getProperty("braintree.enabled"); + //println "++++++++ braintree enabled : ${enabled} +++++++++++" + return enabled + } def getEasyPostEnabled(){ if(!properties)setProperties() String enabled = properties.getProperty("easypost.enabled"); - //println "++++++++ enabled : ${enabled} +++++++++++" + //println "++++++++ easypost enabled : ${enabled} +++++++++++" return enabled } @@ -875,8 +1121,19 @@ class ApplicationService { return numberBigDecimal }else{ - return 0 + return new BigDecimal(0) } } + + def formatTotal(price){ + if(price){ + BigDecimal numberBigDecimal = new BigDecimal(price); + numberBigDecimal = numberBigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP); + + return numberBigDecimal + }else{ + return new BigDecimal(0) + } + } } diff --git a/grails-app/services/org/greenfield/CurrencyService.groovy b/grails-app/services/org/greenfield/CurrencyService.groovy new file mode 100644 index 00000000..9e530adf --- /dev/null +++ b/grails-app/services/org/greenfield/CurrencyService.groovy @@ -0,0 +1,149 @@ +package org.greenfield + +import java.util.Properties; +import grails.util.Holders + + +class CurrencyService { + + def grailsApplication + + private final String SETTINGS_FILE = "settings.properties" + private final String STORE_CURRENCY = "store.currency" + + + + def getCurrency(){ + + if(!grailsApplication){ + grailsApplication = Holders.grailsApplication + } + + Properties prop = new Properties(); + + try{ + + File propertiesFile = grailsApplication.mainContext.getResource("settings/${SETTINGS_FILE}").file + FileInputStream inputStream = new FileInputStream(propertiesFile) + prop.load(inputStream); + + def currency = "USD" + if(prop.getProperty(STORE_CURRENCY)){ + currency = prop.getProperty(STORE_CURRENCY) + } + + return currency.toUpperCase() + + }catch(Exception e){ + e.printStackTrace() + } + } + + + def getCurrencySymbol(){ + if(!grailsApplication){ + grailsApplication = Holders.grailsApplication + } + Properties prop = new Properties(); + + try{ + + File propertiesFile = grailsApplication.mainContext.getResource("settings/${SETTINGS_FILE}").file + FileInputStream inputStream = new FileInputStream(propertiesFile) + prop.load(inputStream); + + def currency = "USD" + if(prop.getProperty(STORE_CURRENCY)){ + currency = prop.getProperty(STORE_CURRENCY) + } + + def currencySymbol + + if(currency){ + switch(currency){ + case "USD" : + currencySymbol = "\$" + break + case "GBP": + currencySymbol = "£" + break + case "NZD" : + currencySymbol = "\$" + break + case "CAD" : + currencySymbol = "C \$" + break + case "EUR": + currencySymbol = "€" + break + case "HKD": + currencySymbol = "HK\$" + break + case "BRL": + currencySymbol = "R\$" + break + case "INR": + currencySymbol = "₹" + break + default : + currencySymbol = "Needs Configuration" + break + } + + return currencySymbol + }else{ + return "currency isn't set..." + } + + }catch(Exception e){ + e.printStackTrace() + return "currency isn't set..." + } + } + + + def format(string){ + def currency = getCurrency() + if(prepend(currency)){ + string = string + " " + getCurrencySymbol() + }else{ + string = getCurrencySymbol() + " " + string + } + } + + + def prepend(currency){ + if(currency == "EUR"){ + return true + } + } + + + /**TODO:for a later date for international shipping**/ + def getCountryCode(){ + + if(!grailsApplication){ + grailsApplication = Holders.grailsApplication + } + Properties prop = new Properties(); + + try{ + + File propertiesFile = grailsApplication.mainContext.getResource("settings/${SETTINGS_FILE}").file + FileInputStream inputStream = new FileInputStream(propertiesFile) + prop.load(inputStream); + + def countryCode = "us" + if(prop.getProperty(STORE_COUNTRY_CODE)){ + countryCode = prop.getProperty(STORE_COUNTRY_CODE) + } + + return countryCode + + }catch(Exception e){ + e.printStackTrace() + return "country isn't set..." + } + } + +} \ No newline at end of file diff --git a/grails-app/services/org/greenfield/EmailService.groovy b/grails-app/services/org/greenfield/EmailService.groovy index 40c92078..7a42caa4 100644 --- a/grails-app/services/org/greenfield/EmailService.groovy +++ b/grails-app/services/org/greenfield/EmailService.groovy @@ -9,7 +9,7 @@ import javax.mail.Session; import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import javax.mail.Authenticator; +import javax.mail.Authenticator; class EmailService { @@ -44,7 +44,9 @@ class EmailService { return new PasswordAuthentication(username, password); } }); - + + //session.setDebug(true); + try { Message message = new MimeMessage(session); diff --git a/grails-app/services/org/greenfield/ExportDataService.groovy b/grails-app/services/org/greenfield/ExportDataService.groovy index e0a62203..e5002d9d 100644 --- a/grails-app/services/org/greenfield/ExportDataService.groovy +++ b/grails-app/services/org/greenfield/ExportDataService.groovy @@ -121,10 +121,11 @@ class ExportDataService { } if(params.exportLayout == "on"){ - println "exporting layout..." - def layout = Layout.findByName("STORE_LAYOUT") - layout = formatLayout(layout) - data['layout'] = layout + println "exporting layouts disabled, quotes issue on ..." + + //def layout = Layout.findByName("STORE_LAYOUT") + //layout = formatLayout(layout) + //data['layout'] = layout } if(params.exportLogs == "on"){ @@ -230,6 +231,7 @@ class ExportDataService { def data = [:] data['uuid'] = catalog.uuid data['name'] = catalog.name + data['layout'] = catalog.layout.uuid data['description'] = catalog?.description ? catalog.description : "" //TODO:might not need //data['toplevel'] = catalog.toplevel @@ -268,6 +270,7 @@ class ExportDataService { product['height'] = p.height product['weight'] = p.weight product['productNo'] = p.productNo + product['layout'] = p.layout.uuid product['dateCreated'] = p.dateCreated product['lastUpdated'] = p.lastUpdated @@ -550,6 +553,7 @@ class ExportDataService { page['uuid'] = p.uuid page['title'] = p.title page['content'] = p.content + page['layout'] = p.layout.uuid page['dateCreated'] = p.dateCreated page['lastUpdated'] = p.lastUpdated @@ -584,6 +588,8 @@ class ExportDataService { def layout = [:] layout['uuid'] = l.uuid layout['content'] = l.content + layout['css'] = l.css + layout['javascript'] = l.javascript layout['dateCreated'] = l.dateCreated layout['lastUpdated'] = l.lastUpdated diff --git a/grails-app/views/account/admin_create.gsp b/grails-app/views/account/admin_create.gsp index 57bbfd6e..1ed0de66 100644 --- a/grails-app/views/account/admin_create.gsp +++ b/grails-app/views/account/admin_create.gsp @@ -1,5 +1,7 @@ <%@ page import="org.greenfield.Account" %> <%@ page import="org.greenfield.State" %> +<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()%> + @@ -43,7 +45,7 @@ -
City
@@ -116,7 +117,23 @@
-
+
+
+
+
+
+
+
+
+
+
State
@@ -125,7 +142,8 @@
value="${accountInstance?.state?.id}"
optionKey="id"
optionValue="name"
- class="form-control"/>
+ class="form-control"
+ id="stateSelect"/>
@@ -172,5 +190,15 @@
+
+
+
+
+
diff --git a/grails-app/views/account/admin_edit.gsp b/grails-app/views/account/admin_edit.gsp
index 26b58aa2..7388d56d 100644
--- a/grails-app/views/account/admin_edit.gsp
+++ b/grails-app/views/account/admin_edit.gsp
@@ -1,6 +1,9 @@
<%@ page import="org.greenfield.Account" %>
<%@ page import="org.greenfield.common.RoleName" %>
<%@ page import="org.greenfield.State" %>
+<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()%>
+
+
@@ -17,6 +20,9 @@
+
+
Edit Account
@@ -30,9 +36,6 @@
-
+
+
+ ${flash.message}
+ Edit Account
@@ -30,9 +36,6 @@
-
-
-
@@ -117,7 +120,25 @@
-
@@ -117,7 +120,25 @@
+
+
+
+
+
+
+
+
+
State
@@ -126,7 +147,8 @@
value="${accountInstance?.state?.id}"
optionKey="id"
optionValue="name"
- class="form-control"/>
+ class="form-control"
+ id="stateSelect"/>
@@ -178,10 +200,33 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/grails-app/views/account/admin_list.gsp b/grails-app/views/account/admin_list.gsp
index 217953f7..1dc61ba7 100644
--- a/grails-app/views/account/admin_list.gsp
+++ b/grails-app/views/account/admin_list.gsp
@@ -13,6 +13,12 @@ page import="org.greenfield.Transaction"
-
No Accounts created yet, you just opened up a store on undeveloped land on the internet. You will have customer accounts. Hang tight...
+No accounts found yet...
+ + + +
+
+
+
+
+
+
+
+
State
diff --git a/grails-app/views/account/complete_signup.gsp b/grails-app/views/account/complete_signup.gsp
new file mode 100644
index 00000000..c336b11d
--- /dev/null
+++ b/grails-app/views/account/complete_signup.gsp
@@ -0,0 +1,95 @@
+<%@ page import="org.greenfield.ApplicationService" %>
+<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()
+%>
+
+
+${raw(applicationService.getScreenHeader("Registration"))}
+
+
+
-
-
-
-
-
-
- <%--
-
-
- ${productSpecification.specificationOption.specification.name}: ${productSpecification.specificationOption.name}
-
+
+
+
+
+
+
+
+
- --%>
+
+
@@ -224,4 +223,4 @@ for (Object param : keys) {
-${raw(applicationService.getFooter())}
+${raw(applicationService.getCatalogFooter(catalogInstance, false, params))}
diff --git a/grails-app/views/catalog/show.gsp b/grails-app/views/catalog/show.gsp
index 6f35e4f9..72ab6f76 100644
--- a/grails-app/views/catalog/show.gsp
+++ b/grails-app/views/catalog/show.gsp
@@ -84,6 +84,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+${raw(applicationService.getScreenFooter("Registration"))}
\ No newline at end of file
diff --git a/grails-app/views/account/customer_profile.gsp b/grails-app/views/account/customer_profile.gsp
index f0bab40c..ddddcf5a 100644
--- a/grails-app/views/account/customer_profile.gsp
+++ b/grails-app/views/account/customer_profile.gsp
@@ -1,9 +1,9 @@
<%@ page import="org.greenfield.State" %>
+<%@ page import="org.greenfield.Country %>
<%@ page import="org.greenfield.ApplicationService" %>
-<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()
-%>
+<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()%>
-${raw(applicationService.getHeader("Account Info"))}
+${raw(applicationService.getDefaultHeader("Account Info"))}
-
- Complete Signup
+ + +${flash.message}
+
+
+ -
+
- data-field-id="${error.field}">
Complete an account and start shopping.
+ + +
+
+ ${accountInstance?.email}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- $${applicationService.formatPrice(productInstance.price)}
- $${applicationService.formatPrice(productInstance.salesPrice)}
-
-
- $${applicationService.formatPrice(productInstance.price)}
-
-
-
+ ${currencyService.format(applicationService.formatPrice(productInstance.price))}
+ ${currencyService.format(applicationService.formatPrice(productInstance.salesPrice))}
+
+
+ ${currencyService.format(applicationService.formatPrice(productInstance.price))}
+
+
+ In Store Only
++ + +
+ Layout
+
+
+
+
+
@@ -96,9 +112,8 @@
-
-
-
+
+
@@ -152,6 +157,12 @@ page import="org.greenfield.log.SearchLog"
+
+ diff --git a/grails-app/views/configuration/manage_key.gsp b/grails-app/views/configuration/manage_key.gsp new file mode 100644 index 00000000..7a154350 --- /dev/null +++ b/grails-app/views/configuration/manage_key.gsp @@ -0,0 +1,60 @@ +<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()%> + + + + +
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/grails-app/views/configuration/payment_settings.gsp b/grails-app/views/configuration/payment_settings.gsp
new file mode 100644
index 00000000..89c2fca0
--- /dev/null
+++ b/grails-app/views/configuration/payment_settings.gsp
@@ -0,0 +1,406 @@
+<%@ page import="org.greenfield.Catalog" %>
+<% def applicationService = grailsApplication.classLoader.loadClass('org.greenfield.ApplicationService').newInstance()%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Payment Settings
+ + +${flash.message}
+ Gateway Settings
+ + +In order for Greenfield to work, you need to have a payment gateway account with either Stripe or Braintree. These services allow you to quickly setup Merchant accounts to
+ start accepting payments (recommended : Stripe).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/grails-app/views/configuration/settings.gsp b/grails-app/views/configuration/settings.gsp
index 05b69538..22fd28af 100644
--- a/grails-app/views/configuration/settings.gsp
+++ b/grails-app/views/configuration/settings.gsp
@@ -5,15 +5,18 @@
+
+
+
+
+
+ })
+
+
+
+
+
+ })
+
+
+
+
+ +
${flash.message}
+
+
+Return to Payment Settings
+
+
+ +
+
+